[Checkins] SVN: Products.GenericSetup/trunk/ Fixed the profile_id UnboundLocalError in the upgradeDepends directive when

[Vincent Fretin]

Log message for revision 120763:
  Fixed the profile_id UnboundLocalError in the upgradeDepends directive when
  import_profile is not None
  

Changed:
  U   Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
  U   Products.GenericSetup/trunk/docs/CHANGES.rst

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2011-03-05 10:13:24 UTC (rev 120762)
+++ Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2011-03-05 10:52:10 UTC (rev 120763)
@@ -158,6 +158,8 @@
     def doStep(self, tool):
         if self.import_profile is None:
             profile_id = 'profile-%s' % self.profile
+        else:
+            profile_id = self.import_profile
         if self.import_steps:
             for step in self.import_steps:
                 tool.runImportStepFromProfile(profile_id, step,
@@ -217,7 +219,7 @@
     res = []
     profile_steps = _upgrade_registry.getUpgradeStepsForProfile(profile_id)
     for id, step in profile_steps.items():
-        if type(step) == UpgradeStep:
+        if isinstance(step, UpgradeEntity):
             info = _extractStepInfo(tool, id, step, source)
             if info is None:
                 continue

Modified: Products.GenericSetup/trunk/docs/CHANGES.rst
===================================================================
--- Products.GenericSetup/trunk/docs/CHANGES.rst	2011-03-05 10:13:24 UTC (rev 120762)
+++ Products.GenericSetup/trunk/docs/CHANGES.rst	2011-03-05 10:52:10 UTC (rev 120763)
@@ -4,6 +4,9 @@
 1.6.3 (unreleased)
 ------------------
 
+- Fixed the profile_id UnboundLocalError in the upgradeDepends directive when
+  import_profile is not None.
+
 - Removed ``five.formlib`` dependency. ``zope.formlib`` is now used directly.
 
 - Import form: Sort the list of extension profiles alphabetically by title.