[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py use profile- as prefix in both cases

[Godefroid Chapelle]

Log message for revision 120858:
  use profile- as prefix in both cases
  

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

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2011-03-10 23:45:18 UTC (rev 120857)
+++ Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2011-03-11 09:47:54 UTC (rev 120858)
@@ -155,11 +155,13 @@
         self.run_deps = run_deps
         self.purge = purge
 
+    PROFILE_PREFIX = 'profile-%s'
+
     def doStep(self, tool):
         if self.import_profile is None:
-            profile_id = 'profile-%s' % self.profile
+            profile_id = self.PROFILE_PREFIX % self.profile
         else:
-            profile_id = self.import_profile
+            profile_id = self.PROFILE_PREFIX % self.import_profile
         if self.import_steps:
             for step in self.import_steps:
                 tool.runImportStepFromProfile(profile_id, step,
@@ -196,7 +198,7 @@
             stop = normalize_version(step.dest)
             if ((start is not None and start < source) or
                 (stop is not None and stop <= source)):
-                    return
+                return
     info = {
         'id': id,
         'step': step,