[Checkins] SVN: Products.GenericSetup/trunk/Products/GenericSetup/ Also use the normalize code when sorting versions on the tools ZMI upgrades page.

[Hanno Schlichting]

Log message for revision 85323:
  Also use the normalize code when sorting versions on the tools ZMI upgrades page.
  

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

-=-
Modified: Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2008-04-13 02:29:29 UTC (rev 85322)
+++ Products.GenericSetup/trunk/Products/GenericSetup/CHANGES.txt	2008-04-13 10:54:52 UTC (rev 85323)
@@ -8,7 +8,8 @@
 
     - Use the parse_version function from pkg_resources to normalize versions
       before comparing them inside the upgrade code. This ensures pre-release
-      versions are handled correctly.
+      versions are handled correctly. Also use the normalize code when sorting
+      versions on the tools ZMI upgrades page.
 
     - Fixed the upgrade step directive schema. Description is not required.
 

Modified: Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py
===================================================================
--- Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2008-04-13 02:29:29 UTC (rev 85322)
+++ Products.GenericSetup/trunk/Products/GenericSetup/upgrade.py	2008-04-13 10:54:52 UTC (rev 85323)
@@ -167,7 +167,8 @@
             info = _extractStepInfo(tool, id, step, source)
             if info is None:
                 continue
-            res.append(((step.source or '', step.sortkey, info['proposed']), info))
+            normsrc = normalize_version(step.source)
+            res.append(((normsrc or '', step.sortkey, info['proposed']), info))
         else: # nested steps
             nested = []
             outer_proposed = False
@@ -180,7 +181,8 @@
             if nested:
                 src = nested[0]['source']
                 sortkey = nested[0]['sortkey']
-                res.append(((src or '', sortkey, outer_proposed), nested))
+                normsrc = normalize_version(src)
+                res.append(((normsrc or '', sortkey, outer_proposed), nested))
     res.sort()
     res = [i[1] for i in res]
     return res