r6239 - flumotion/branches/wizard-pluggable-http-consumers/flumotion/manager

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Fri Feb 15 17:47:12 2008
New Revision: 6239

Log:
Restore the old behavior and indentation, exactly

Modified:
   flumotion/branches/wizard-pluggable-http-consumers/flumotion/manager/admin.py

Modified: flumotion/branches/wizard-pluggable-http-consumers/flumotion/manager/admin.py
==============================================================================
--- flumotion/branches/wizard-pluggable-http-consumers/flumotion/manager/admin.py	(original)
+++ flumotion/branches/wizard-pluggable-http-consumers/flumotion/manager/admin.py	Fri Feb 15 17:47:12 2008
@@ -208,11 +208,11 @@
                 componentType)
             # FIXME: add logic here for default entry points and functions
             entry = componentRegistryEntry.getEntryByType(entryType)
-        except (KeyError, errors.UnknownComponentError):
+        except KeyError:
             self.warning("Could not find bundle for %s(%s)" % (
                 componentType, entryType))
             raise errors.NoBundleError("entry type %s in component type %s" %
-                                       (entryType, componentType))
+                (entryType, componentType))
 
         filename = os.path.join(componentRegistryEntry.base, entry.location)
         self.debug('entry point is in file path %s and function %s' % (
@@ -243,10 +243,9 @@
             raise errors.NoBundleError("entry type %s in plug type %s" %
                                        (entryType, plugType))
 
-        filename = entry.location
         self.debug('entry point is in file path %s and function %s' % (
-            filename, entry.function))
-        return (filename, entry.function)
+           entry.location, entry.function))
+        return (entry.location, entry.function)
 
     def perspective_reloadManager(self):
         """