Merge lp:~arges/ubuntu-archive-tools/sru-review1 into lp:ubuntu-archive-tools

[Chris J Arges]

[Brian Murray (brian-murray)]

This looks fine to me, although I'm not perfectly clear on the use case. I think if there are two versions of the package in the queue we should reject one of them, and adding an option to provide the version might result in one of them not being rejected. This could later result in some confusion for the next person processing the queue.

[Chris J Arges (arges)]

The use case is something like, somebody uploads for both backports and proposed.
Example:

[Source] lxc (source)
1.1.5-0ubuntu3~ubuntu14.04.1 main admin medium ubuntu-server Backports 9 minutes ago

[Source] lxc (source)
1.0.8-0ubuntu0.3 main admin medium ubuntu-server Proposed 19 minutes ago

In this case the tool can't handle both and picks the latest. I just want to review the other upload without rejecting the backports one.

[Brian Murray (brian-murray)]

Okay, this seems like a useful addition then, thanks! Feel free to make the merge yourself, as I can't because I'm not in ubuntu-archive.

review: Approve

[Steve Langasek (vorlon)]

In the meantime, this was implemented otherwise in the branch.

review: Disapprove

[Steve Langasek (vorlon)]

actually, there are two pieces of this that are still relevant (there's a --version option, but we still get an error on multiple uploads telling us to handle manually!) So I'll fix this up and apply it.

review: Approve

[Steve Langasek (vorlon)]

nope, on further review, current sru-review works fine with --version :)

review: Disapprove

Unmerged revisions

983. By Chris J Arges on 2015-11-13

sru-review: Add version flag to select when multiple version are in queue

This helps if multiple versions are in the queue. In addition if there is
a version in -backports we may accidentally pick up that diff instead of the
one we want if that diff is before the correct one.

=== modified file 'sru-review'
--- sru-review	2015-10-22 15:58:33 +0000
+++ sru-review	2015-11-13 20:05:58 +0000
@@ -62,6 +62,9 @@
         "-p", dest="ppa", metavar="LP_USER/PPA_NAME",
         help="Check a PPA instead of the Ubuntu unapproved queue")
     parser.add_option(
+        "--version", dest="version",
+        help="Only use specific package version (optional)")
+    parser.add_option(
         "-b", "--browser", dest="browser", action="store_true",
         default=True, help="Open Launchpad bugs in browser")
     parser.add_option(
@@ -104,7 +107,7 @@
     return info
 
 
-def from_queue(options, archive, sourcepkg, series):
+def from_queue(options, archive, sourcepkg, series, version):
     '''Get package_upload from LP and debdiff from queue page.
 
     Return (package_upload, changes URL, debdiff URL) tuple.
@@ -116,14 +119,15 @@
     uploads = [upload for upload in
                series.getPackageUploads(archive=archive, exact_match=True,
                                         name=sourcepkg, pocket='Proposed',
-                                        status=options.queue)]
+                                        status=options.queue, version=version)]
+
     if len(uploads) == 0:
         print('ERROR: Queue does not have an upload of this source.',
               file=sys.stderr)
         sys.exit(1)
-    if len(uploads) > 1:
+    if len(uploads) > 1 and version is None:
         print('ERROR: Queue has more than one upload of this source, '
-              'please handle manually', file=sys.stderr)
+              'please handle manually, or use --version flag', file=sys.stderr)
         sys.exit(1)
     upload = uploads[0]
 
@@ -145,10 +149,17 @@
 
     if options.diff:
         oops_re = re.compile('class="oopsid">(OOPS[a-zA-Z0-9-]+)<')
-        debdiff_re = re.compile(
-            'href="(http://launchpadlibrarian.net/'
-            '\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
-            re.escape(quote(sourcepkg)))
+        if version is None:
+            debdiff_re = re.compile(
+                'href="(http://launchpadlibrarian.net/'
+                '\d+/%s_[^"_]+_[^_"]+\.diff\.gz)">\s*diff from' %
+                re.escape(quote(sourcepkg)))
+        else:
+            debdiff_re = re.compile(
+                'href="(http://launchpadlibrarian.net/'
+                '\d+/%s_[^_"]+_%s\.diff\.gz)">\s*diff from' %
+                (re.escape(quote(sourcepkg)), re.escape(quote(version))))
+
 
         queue_html = urlopen(queue_url).read()
 
@@ -334,7 +345,7 @@
         (changes_url, debdiff_url) = from_ppa(opts, sourcepkg, user, ppaname)
     else:
         (upload, changes_url, debdiff_url) = from_queue(
-            opts, archive, sourcepkg, series)
+            opts, archive, sourcepkg, series, opts.version)
 
     # Check for existing version in proposed
     if series != ubuntu.current_series: