wingo - in flumotion/trunk: . flumotion/common

[flumotion-commit at lists.fluendo.com]

Author: wingo
Date: Mon Jan  8 18:07:56 2007
New Revision: 4377

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/common/planet.py
Log:
2007-01-08  Andy Wingo  <wingo at pobox.com>

	* flumotion/common/planet.py (ManagerComponentState.setJobState):
	Make sure mood is proxied last, fixes #552.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Jan  8 18:07:56 2007
@@ -1,5 +1,8 @@
 2007-01-08  Andy Wingo  <wingo at pobox.com>
 
+	* flumotion/common/planet.py (ManagerComponentState.setJobState):
+	Make sure mood is proxied last, fixes #552.
+
 	* flumotion/manager/component.py (ComponentAvatar._setMood): use
 	setMood.
 	(ComponentAvatar.detached): Actually unlink the jobstate and

Modified: flumotion/trunk/flumotion/common/planet.py
==============================================================================
--- flumotion/trunk/flumotion/common/planet.py	(original)
+++ flumotion/trunk/flumotion/common/planet.py	Mon Jan  8 18:07:56 2007
@@ -235,6 +235,8 @@
         self._jobState = jobState
         for key in _jobStateKeys:
             # only set non-None values
+            if key == 'mood':
+                continue
             v = jobState.get(key)
             if v != None:
                 self.set(key, v)
@@ -243,6 +245,8 @@
             if list != None:
                 for v in list:
                     self.append(key, v)
+        # set mood last; see #552
+        self.set('mood', jobState.get('mood'))
                 
         # only proxy keys we want proxied; eaterNames and feederNames
         # are ignored for example