[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/tool.py Prefer data from the profile registry over the global step registry. This prevents existing sites which have a slightly different step registration, such as Plone 3 which adds a dependency to the componentregistry step, from suddenly breaking.

Wichert Akkerman wichert at wiggy.net
Tue Jan 15 05:59:54 EST 2008


Log message for revision 82891:
  Prefer data from the profile registry over the global step registry. This prevents existing sites which have a slightly different step registration, such as Plone 3 which adds a dependency to the componentregistry step, from suddenly breaking.

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/tool.py

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/tool.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2008-01-15 10:13:09 UTC (rev 82890)
+++ Products.GenericSetup/trunk/Products/GenericSetup/tool.py	2008-01-15 10:59:52 UTC (rev 82891)
@@ -293,18 +293,18 @@
     security.declareProtected(ManagePortal, 'getImportStepMetadata')
     def getImportStepMetadata(self, step, default=None):
         """Simple wrapper to query both the global and local step registry."""
-        res=_import_step_registry.getStepMetadata(step, default)
+        res=self._import_registry.getStepMetadata(step, default)
         if res is not default:
             return res
-        return self._import_registry.getStepMetadata(step, default)
+        return _import_step_registry.getStepMetadata(step, default)
 
     security.declareProtected(ManagePortal, 'getExportStepMetadata')
     def getExportStepMetadata(self, step, default=None):
         """Simple wrapper to query both the global and local step registry."""
-        res=_export_step_registry.getStepMetadata(step, default)
+        res=self._export_registry.getStepMetadata(step, default)
         if res is not default:
             return res
-        return self._export_registry.getStepMetadata(step, default)
+        return _export_step_registry.getStepMetadata(step, default)
 
     security.declareProtected(ManagePortal, 'getToolsetRegistry')
     def getToolsetRegistry(self):



More information about the Checkins mailing list