Merge ~brian-murray/ubuntu-archive-tools:sru-review-updates into ubuntu-archive-tools:main

[Brian Murray]

sru-review is supposed to check if a there is an existing SRU of a package in -proposed and while it did that what it did not do was properly check to see if that package was copied to -updates. This fixes that by checking for the same version of the package in the -updates pocket as is in the -proposed pocket. (The old way never would have worked as the source package publishing history records are different.)

[Łukasz Zemczak (sil2100)]

Ok, code-wise it looks good. The only thing I would be worried about if not all the variable references were updated after the variable renaming. Otherwise, please go ahead!

review: Approve

diff --git a/sru-review b/sru-review
index 600a74a..d644eef 100755
--- a/sru-review
+++ b/sru-review
@@ -364,19 +364,26 @@ if __name__ == '__main__':
         (upload, changes_url, debdiff) = from_queue(
             opts, archive, sourcepkg, series, version)
 
-    # Check for existing version in proposed
+    # Check to see if there is an existing SRU of the package in -proposed
+    # and also check that it has not been copied to -updates yet.
     if series != ubuntu.current_series:
+        # need the spph so we have access to the package name, version and
+        # changes_url
         existing = [
-            pkg for pkg in archive.getPublishedSources(
+            spph for spph in archive.getPublishedSources(
                 exact_match=True, distro_series=series, pocket='Proposed',
                 source_name=sourcepkg, status='Published')]
-        updates = [
-            pkg for pkg in archive.getPublishedSources(
+        # only the package name and version are needed for the check
+        updates_details = [
+            (spph.source_package_name, spph.source_package_version)
+                for spph in archive.getPublishedSources(
                 exact_match=True, distro_series=series, pocket='Updates',
                 source_name=sourcepkg, status='Published')]
-        for pkg in existing:
-            if pkg not in updates:
-                changesfile_url = pkg.changesFileUrl()
+        for spph in existing:
+            pkg_name = spph.source_package_name
+            pkg_vers = spph.source_package_version
+            if (pkg_name, pkg_vers) not in updates_details:
+                changesfile_url = spph.changesFileUrl()
                 changes = parse_changes(changesfile_url)
                 msg = ('''\
 *******************************************************
@@ -385,7 +392,7 @@ if __name__ == '__main__':
 * SRU Bug: LP: #%s
 *
 *******************************************************''' %
-                       (sourcepkg, pkg.source_package_version,
+                       (sourcepkg, pkg_vers,
                         ' LP: #'.join(changes['bugs'])))
                 print(msg, file=sys.stderr)
                 print('''View the debdiff anyway? [yN]''', end="")