Merge lp:~james-page/ubuntu-reports/ca-cloud-fix into lp:ubuntu-reports

[James Page]

This fix ensures that if multiple ~cloudX uploads are made to the
Ubuntu Cloud archive then the version checks still work.

[Adam Gandelman (gandelman-a)]

'cloud0' is also hard-coded in render_table() and needs to be similarly updated there, as well, so that the html output compares version correctly, too.

review: Needs Fixing

[lp:~james-page/ubuntu-reports/ca-cloud-fix]

102. By James Page on 2013-04-30

Fixup cloud0 -> cloud

=== modified file 'server/cloud-archive/version-tracker/ca-versions.py'
--- server/cloud-archive/version-tracker/ca-versions.py	2012-12-07 21:45:15 +0000
+++ server/cloud-archive/version-tracker/ca-versions.py	2013-04-30 15:47:27 +0000
@@ -107,11 +107,11 @@
         # set cells green if they contain the most recent version.
         newest_vers = _newest_vers([c['version'] for c in row])
         for c in row:
-            # strip the ~cloud0 tag so we can just use native python comparison
+            # strip the ~cloud tag so we can just use native python comparison
             # here.
             if not c['version']:
                 c['color'] = OLD_COLOR
-            elif c['version'].split("~cloud0")[0] == newest_vers.split("~cloud0")[0]:
+            elif c['version'].split("~cloud")[0] == newest_vers.split("~cloud")[0]:
                 c['color'] = NEW_COLOR
             else:
                 c['color'] = OLD_COLOR
@@ -161,7 +161,7 @@
 
     out = ''
     for package in staging:
-        s_vers = staging[package].split('~cloud0')[0]
+        s_vers = staging[package].split('~cloud')[0]
         u_vers = ubuntu[package]
         if _dpkg_comp_pkg(u_vers, s_vers):
             out += '%s:\n' % package