jhbuild r2468 - in trunk: . jhbuild/frontends

[fpeters svn gnome org]

Author: fpeters
Date: Wed Nov  5 16:22:32 2008
New Revision: 2468
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2468&view=rev

Log:
* jhbuild/frontends/terminal.py: do not use Exception.message as it has
been deprecated in Python 2.6.



Modified:
   trunk/ChangeLog
   trunk/jhbuild/frontends/terminal.py

Modified: trunk/jhbuild/frontends/terminal.py
==============================================================================
--- trunk/jhbuild/frontends/terminal.py	(original)
+++ trunk/jhbuild/frontends/terminal.py	Wed Nov  5 16:22:32 2008
@@ -247,9 +247,14 @@
         '''handle error during build'''
         summary = _('error during stage %(stage)s of %(module)s') % {
             'stage':state, 'module':module.name}
-        self.message('%s: %s' % (summary, error.message))
+        try:
+            error_message = error.args[0]
+            self.message('%s: %s' % (summary, error_message))
+        except:
+            error_message = None
+            self.message(summary)
         self.trayicon.set_icon(os.path.join(icondir, 'error.png'))
-        self.notify.notify(summary = summary, body = error.message,
+        self.notify.notify(summary = summary, body = error_message,
                 icon = 'dialog-error', expire = 20)
 
         if self.config.trycheckout and (not self.triedcheckout) and altstates.count('force_checkout'):