zaheer - in flumotion/trunk: . flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Wed Jun  6 17:56:47 2007
New Revision: 5115

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/manager/manager.py
Log:
	* flumotion/manager/manager.py (Vishnu.fixOldEaterConfig):
	conf is a dict, don't use set!
	Fix up the source node in the config correctly on newly
	logging in components.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jun  6 17:56:47 2007
@@ -1,5 +1,12 @@
 2007-06-06  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
+	* flumotion/manager/manager.py (Vishnu.fixOldEaterConfig):
+	conf is a dict, don't use set!
+	Fix up the source node in the config correctly on newly
+	logging in components.
+
+2007-06-06  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
+
 	* flumotion/component/combiners/switch/basicwatchdog.py
 	  (AVBasicWatchdog.eaterSetInactive):
 	Use correct method name.

Modified: flumotion/trunk/flumotion/manager/manager.py
==============================================================================
--- flumotion/trunk/flumotion/manager/manager.py	(original)
+++ flumotion/trunk/flumotion/manager/manager.py	Wed Jun  6 17:56:47 2007
@@ -1010,7 +1010,12 @@
                            "is stop the component, restart manager and "
                            "start it again.")))
                     state.append('messages', message)
-                conf.set('eater', eatersDict)
+                conf['eater'] =  eatersDict
+            if sourceConfig:
+                sources = []
+                for s in sourceConfig:
+                    sources.append(parseFeedId(s))
+                conf['source'] = sources
 
         def verifyExistingComponentState(jobState, state):
             # condition (1)