msmith - in flumotion/trunk: . flumotion/common flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: msmith
Date: Mon Jul  9 15:00:41 2007
New Revision: 5306

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/common/config.py
   flumotion/trunk/flumotion/manager/manager.py
Log:
        * flumotion/common/config.py:
          If a <source> is specified for a component that has no eaters, raise
          a ConfigError with an appropriate message.

        * flumotion/manager/manager.py:
          If we fail to parse a config, call fail() instead of faile(), it
          exists more.
          Fixes #713.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Jul  9 15:00:41 2007
@@ -1,3 +1,14 @@
+2007-07-09  Michael Smith <msmith at fluendo.com>
+
+	* flumotion/common/config.py:
+	  If a <source> is specified for a component that has no eaters, raise
+	  a ConfigError with an appropriate message.
+
+	* flumotion/manager/manager.py:
+	  If we fail to parse a config, call fail() instead of faile(), it
+	  exists more.
+	  Fixes #713.
+
 2007-07-06  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* flumotion/manager/depgraph.py:

Modified: flumotion/trunk/flumotion/common/config.py
==============================================================================
--- flumotion/trunk/flumotion/common/config.py	(original)
+++ flumotion/trunk/flumotion/common/config.py	Mon Jul  9 15:00:41 2007
@@ -53,6 +53,9 @@
     eaters = {}
     for eater, feedId in eatersList:
         if eater is None:
+            if not eaterDefs:
+                raise ConfigError("Feed %r cannot be connected, component has "
+                    "no eaters" % (feedId,))
             # cope with old <source> entries
             eater = eaterDefs[0].getName()
         feeders = eaters.get(eater, [])

Modified: flumotion/trunk/flumotion/manager/manager.py
==============================================================================
--- flumotion/trunk/flumotion/manager/manager.py	(original)
+++ flumotion/trunk/flumotion/manager/manager.py	Mon Jul  9 15:00:41 2007
@@ -630,7 +630,7 @@
             self.addMessage(messages.WARNING, mid,
                             N_('Unknown error while loading configuration.'),
                             debug=log.getExceptionMessage(e))
-            return defer.faile(e)
+            return defer.fail(e)
             
     def _loadManagerPlugs(self, conf):
         # Load plugs