Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-version-in-url into lp:ubuntu-archive-tools

[Brian Murray]

I updated daisy to return the package version in the web_link data provided in the json file, so the phased-updater doesn't need to add it.

Also I fixed a crash where previous amount was None.

=== modified file 'phased-updater'
--- phased-updater	2014-04-18 21:02:58 +0000
+++ phased-updater	2014-06-12 00:07:22 +0000
@@ -18,7 +18,7 @@
 '''Increment the Phased-Update-Percentage for a package
 
 Check to see whether or not there is a regression (new crash bucket or
-increase rate of errors about a package) using errors.ubuntu.com and if
+increase in rate of errors about a package) using errors.ubuntu.com and if
 not increment the Phased-Update-Percentage for the package.
 Additionally, generate an html report regarding state of phasing of
 packages and email uploaders regarding issues with their uploads.
@@ -442,6 +442,7 @@
             if not previous_amount:
                 logging.info('No previous crash data found for %s %s' %
                              (src_pkg, pvers))
+                previous_amount = 0
             if 'difference' in data:
                 increase = data['difference']
             elif 'this_count' in data:
@@ -453,8 +454,10 @@
             logging.info('[%s/%s] increase: %s, previous_avg: %s' %
                          (release_name.replace('Ubuntu ', ''), src_pkg,
                           increase, previous_amount))
-            # 2013-06-20 - Fix errors api to add this
-            link = data['web_link'] + '&version=%s' % version
+            if '&version=' not in data['web_link']:
+                link = data['web_link'] + '&version=%s' % version
+            else:
+                link = data['web_link']
             logging.info('Details (rate increase): %s' % link)
             return(increase, link)