[Checkins] SVN: Products.GenericSetup/branches/ra-depends-tag/Products/GenericSetup/upgrade.py prepend 'profile-' to the profile id so the tool is happy w/ the import

[Rob Miller]

Log message for revision 89483:
  prepend 'profile-' to the profile id so the tool is happy w/ the import
  context identifier
  

Changed:
  U   Products.GenericSetup/branches/ra-depends-tag/Products/GenericSetup/upgrade.py

-=-
Modified: Products.GenericSetup/branches/ra-depends-tag/Products/GenericSetup/upgrade.py
===================================================================
--- Products.GenericSetup/branches/ra-depends-tag/Products/GenericSetup/upgrade.py	2008-08-07 01:55:02 UTC (rev 89482)
+++ Products.GenericSetup/branches/ra-depends-tag/Products/GenericSetup/upgrade.py	2008-08-07 02:06:05 UTC (rev 89483)
@@ -152,16 +152,17 @@
         self.purge = purge
 
     def doStep(self, tool):
+        profile_id = 'profile-%s' % self.profile
         if self.import_steps:
             for step in self.import_steps:
-                tool.runImportStepFromProfile(self.profile, step,
+                tool.runImportStepFromProfile(profile_id, step,
                                               run_dependencies=self.run_deps,
                                               purge_old=self.purge)
         else:
             # if no steps are specified we assume we want to reimport
             # the entire profile
             ign_deps = not self.run_deps
-            tool.runAllImportStepsFromProfile(self.profile,
+            tool.runAllImportStepsFromProfile(profile_id,
                                               purge_old=self.purge,
                                               ignore_dependencies=ign_deps)