zaheer - in flumotion/trunk: . flumotion/admin/gtk

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Thu Jun  7 16:50:05 2007
New Revision: 5129

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/admin/gtk/client.py
Log:
	* flumotion/admin/gtk/client.py (Window._instanceSetup):
	Fix bug where there is an exception in setup() of an
	admin gtk, we instead always were outputting setup()
	does not return a deferred.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu Jun  7 16:50:05 2007
@@ -1,5 +1,12 @@
 2007-06-07  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
+	* flumotion/admin/gtk/client.py (Window._instanceSetup):
+	Fix bug where there is an exception in setup() of an
+	admin gtk, we instead always were outputting setup()
+	does not return a deferred.
+
+2007-06-07  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
 	* flumotion/component/combiners/switch/basicwatchdog.py
 	  (SingleBasicWatchdog.eaterSetActive):
 	Bad logic in SingleBasicWatchdog. Fixed.

Modified: flumotion/trunk/flumotion/admin/gtk/client.py
==============================================================================
--- flumotion/trunk/flumotion/admin/gtk/client.py	(original)
+++ flumotion/trunk/flumotion/admin/gtk/client.py	Thu Jun  7 16:50:05 2007
@@ -334,7 +334,7 @@
         except Exception, e:
             msg = log.getExceptionMessage(e)
         self.debug('Setup instance %r' % instance)
-        if not d:
+        if not d and not msg:
             msg = "%r.setup() should return a deferred" % klass
 
         if msg: