Merge lp:~arvindsraj-deactivatedaccount/bzr-gtk/gpreferences-665560 into lp:bzr-gtk/gtk2

[Arvind S Raj]

"bzr gpreferences" displays no graphical error is the user details have not been set by "bzr whoami". This becomes confusing, when run from System -> Preferences -> Bazaar Preferences, since no feedback is given. Added a graphical error in addition to printing the error in the command line.

[Jelmer Vernooij (jelmer)]

The preferences window is used to set the user name, so it's wrong for us to complain if it's not set yet. Instead, we should fix where we raise this exception.

review: Disapprove (code)

Unmerged revisions

701. By Arvind S Raj on 2010-12-18

gpreferences 'crash' fixed

=== modified file 'commands.py'
--- commands.py	2010-10-27 13:43:51 +0000
+++ commands.py	2010-12-18 02:18:09 +0000
@@ -373,8 +373,13 @@
     def run(self):
         open_display()
         from bzrlib.plugins.gtk.preferences import PreferencesWindow
-        dialog = PreferencesWindow()
-        dialog.run()
+        try:
+            dialog = PreferencesWindow()
+            a = dialog.run()
+        except NoWhoami, error_msg:
+            error_dialog(_i18n('Unable to determine your name.'), \
+                         _i18n('Please, set your name with the "whoami" command.'))
+            print error_msg
 
 
 class cmd_gmerge(Command):