Merge lp:~brian-murray/ubuntu-archive-tools/phased-updater-502 into lp:ubuntu-archive-tools

[Brian Murray]

Also handle a 502 error code when retrieving json files from errors.ubuntu.com. Looking closer at errors I noticed that rate of crashes does not perform a package version lookup so that will not return a 404 so I removed that.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'phased-updater'
--- phased-updater	2013-06-27 16:04:54 +0000
+++ phased-updater	2013-07-17 22:11:34 +0000
@@ -330,8 +330,8 @@
         (quote(src_pkg), quote(previous_version), quote(new_version))
     new_buckets_file = urlopen(new_buckets_url)
     # LP: #1193022 - 404 returned when a package version is not found
-    if new_buckets_file.getcode() == 404:
-        logging.error('404 with %s' % new_buckets_url)
+    if new_buckets_file.getcode() in [404, 502]:
+        logging.error('HTTP error retrieving %s' % new_buckets_url)
         return False
     try:
         new_buckets_data = json.load(new_buckets_file)
@@ -363,9 +363,8 @@
         '&release=%s&package=%s' % \
         (quote(release), quote(src_pkg))
     rate_file = urlopen(rate_url)
-    # LP: #1193022 - 404 returned when a package version is not found
-    if rate_file.getcode() == 404:
-        logging.error('404 with %s' % rate_url)
+    if rate_file.getcode() == 502:
+        logging.error('HTTP error retrieving %s' % rate_url)
         return False
     rate_data = json.load(rate_file)
     if 'error_message' in rate_data.keys():