Merge lp:~sil2100/ubuntu-archive-tools/sru-review-check-uploads into lp:~vorlon/ubuntu-archive-tools/kernel-sru-review

[Łukasz Zemczak]

Make sure to check both the archive and the UNAPPROVED queue to see if the given package hasn't been handled already. Skip it if it has.

Make sure to check both the archive and the UNAPPROVED queue to see if the given package hasn't been handled already. Skip it if it has.

[lp:~sil2100/ubuntu-archive-tools/sru-review-check-uploads]

1082. By Łukasz Zemczak on 2016-12-21

Change the warning string slightly.

1083. By Łukasz Zemczak on 2016-12-21

As per Steve's recommendation, we need to check all queues - excluding the Rejected queue. Also, uh, not sure how the hard-coded source name ended up here...

=== modified file 'kernel-sru-review'
--- kernel-sru-review	2016-12-21 03:35:20 +0000
+++ kernel-sru-review	2016-12-21 16:50:46 +0000
@@ -75,6 +75,20 @@
     ppa_dsc = list(filter(
                   lambda x: x.endswith('.dsc'), ppa_src.sourceFileUrls()))[0]
 
+    if ppa_ver == source_ver:
+        print("%s already latest in destination archive (%s), skipping" %
+              (source, ppa_ver))
+        return
+
+    queue_uploads = series.getPackageUploads(version=ppa_ver,
+                                             name=source,
+                                             exact_match=True)
+    for upload in queue_uploads:
+        if upload.status != 'Rejected':
+            print("%s already latest in the %s queue (%s), skipping" %
+                  (source, upload.status, ppa_ver))
+            return
+
     new_fullabi = ppa_ver.split('~')[0]
     new_majorabi = re.sub(r"\.[^.]+$", '', new_fullabi)
     new_upstream = new_fullabi.split('-')[0]