arek - in flumotion/branches/platform-3: . flumotion/admin/command

[flumotion-commit at lists.fluendo.com]

Author: arek
Date: Tue Sep 18 16:40:42 2007
New Revision: 5540

Modified:
   flumotion/branches/platform-3/ChangeLog
   flumotion/branches/platform-3/flumotion/admin/command/commands.py
   flumotion/branches/platform-3/flumotion/admin/command/main.py
Log:
	* flumotion/admin/command/commands.py:
	* flumotion/admin/command/main.py:
	Backport r5539: make flumotion-command not hang on errors and not
	operate on non-existing components.



Modified: flumotion/branches/platform-3/ChangeLog
==============================================================================
--- flumotion/branches/platform-3/ChangeLog	(original)
+++ flumotion/branches/platform-3/ChangeLog	Tue Sep 18 16:40:42 2007
@@ -1,3 +1,10 @@
+2007-09-18  Arek Korbik  <arkadini at gmail.com>
+
+	* flumotion/admin/command/commands.py:
+	* flumotion/admin/command/main.py:
+	Backport r5539: make flumotion-command not hang on errors and not
+	operate on non-existing components.
+
 2007-09-18  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/admin/admin.py:

Modified: flumotion/branches/platform-3/flumotion/admin/command/commands.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/admin/command/commands.py	(original)
+++ flumotion/branches/platform-3/flumotion/admin/command/commands.py	Tue Sep 18 16:40:42 2007
@@ -333,7 +333,9 @@
         components = components + planet.get('atmosphere').get('components')
     else:
         c = utils.find_component(planet, avatarPath[1:])
-        components.append(c)
+        if c:
+            components.append(c)
+        # else: message already printed in find_component()
 
     if len(components) > 0:
         def actionComponent(c):

Modified: flumotion/branches/platform-3/flumotion/admin/command/main.py
==============================================================================
--- flumotion/branches/platform-3/flumotion/admin/command/main.py	(original)
+++ flumotion/branches/platform-3/flumotion/admin/command/main.py	Tue Sep 18 16:40:42 2007
@@ -114,7 +114,14 @@
     proc = commandspec[3]
 
     def command(model, quit):
-        proc(model, quit, *vals)
+        def print_traceback(failure):
+            import traceback
+            warn('Operation %s failed:' % op)
+            traceback.print_exc()
+            return failure
+        d = proc(model, quit, *vals)
+        d.addErrback(print_traceback)
+        return d
 
     return command