Merge lp:~brian-murray/ubuntu-archive-tools/sru-review-queues into lp:ubuntu-archive-tools

[Brian Murray]

arges was trying to review a debdiff in the New queue with sru-review and it failed. This fixes that failure.

[lp:~brian-murray/ubuntu-archive-tools/sru-review-queues]

824. By Brian Murray on 2014-04-15

restore empty line

825. By Brian Murray on 2014-04-15

merge with upstream

=== modified file 'sru-review'
--- sru-review	2014-02-24 17:57:37 +0000
+++ sru-review	2014-04-15 18:50:03 +0000
@@ -104,6 +104,10 @@
 
     Return (package_upload, debdiff URL) pair.
     '''
+    queues = {'New': 0, 'Unapproved': 1, 'Rejected': 4}
+    queue_url = ('https://launchpad.net/ubuntu/%s/+queue?'
+                 'queue_state=%s&batch=300' %
+                 (series.name, queues[queue]))
     uploads = [upload for upload in
                series.getPackageUploads(archive=archive, exact_match=True,
                                         name=sourcepkg, pocket='Proposed',
@@ -124,7 +128,7 @@
         '\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
         re.escape(quote(sourcepkg)))
 
-    queue_html = urlopen(queue_url % series.name).read()
+    queue_html = urlopen(queue_url).read()
 
     m = oops_re.search(queue_html)
     if m:
@@ -280,8 +284,6 @@
 if __name__ == '__main__':
 
     default_release = 'saucy'
-    queue_url = ('https://launchpad.net/ubuntu/%s/+queue?'
-                 'queue_state=1&batch=300')
     ppa_url = ('https://launchpad.net/~%s/+archive/%s/+packages?'
                'field.series_filter=%s')