Merge lp:~mterry/quickly/648496 into lp:quickly

[Michael Terry]

See bug 648496. This just makes the relatively common (for first time users) NoWhoami exception less scary (and not trigger apport).

[John C Barstow (jbowtie)]

This looks like an obvious improvement to me.

review: Approve

[Michael Terry (mterry)]

I actually just proposed https://code.launchpad.net/~mterry/quickly/revert-bzr/+merge/36860 that reverts all the bzr changes. Meaning this branch should stick around, but wait until we put the bzr changes back in for natty cycle.

=== modified file 'data/templates/ubuntu-application/create.py'
--- data/templates/ubuntu-application/create.py	2010-08-13 15:04:05 +0000
+++ data/templates/ubuntu-application/create.py	2010-09-27 13:13:02 +0000
@@ -108,10 +108,16 @@
 # add it to revision control
 print _("Creating bzr repository and commiting")
 from bzrlib.bzrdir import BzrDir
+from bzrlib.errors import NoWhoami
 branch = BzrDir.create_branch_convenience(".")
 wt = branch.bzrdir.open_workingtree()
 wt.smart_add(["."])
-wt.commit("Initial project creation with Quickly!")
+try:
+    wt.commit("Initial project creation with Quickly!")
+except NoWhoami, err:
+    # Don't show full traceback, just the user-friendly bits
+    print err
+    sys.exit(1)
 
 # run the new application if X display
 if templatetools.is_X_display() and os.path.isfile(exec_file):