Merge lp:~laney/ubuntu-archive-tools/promote-to-release-move into lp:ubuntu-archive-tools

[Iain Lane]

[Colin Watson (cjwatson)]

This LGTM.

It may be worth noting that this makes the handling of single-architecture promotions even more obviously fictional than it already was. It was already the case that requesting a single-architecture promotion in fact caused the source and all its binaries to be copied (since copyPackage doesn't expose a way to limit the copy by architectures). promote-by-release previously attempted to limit the deletion by architecture, but that didn't actually make much sense without also limiting the copy. Now the whole source will be both copied and deleted, or neither, regardless of any attempt by britney to request promotions of single architectures.

I think this is not really any worse than what was there before, but I thought I'd point it out.

review: Approve

=== modified file 'promote-to-release'
--- promote-to-release	2020-11-02 18:24:01 +0000
+++ promote-to-release	2021-03-04 17:26:00 +0000
@@ -53,10 +53,10 @@
             return True
 
     if options.dry_run:
-        print("Would copy: %s" % display)
+        print("Would move: %s" % display)
         return
     elif options.verbose:
-        print("Copying: %s" % display)
+        print("Moving: %s" % display)
         sys.stdout.flush()
 
     try:
@@ -64,7 +64,7 @@
         if options.pocket == 'updates':
             percentage = 10
         options.archive.copyPackage(
-            source_name=name, version=version,
+            move=True, source_name=name, version=version,
             from_archive=options.archive,
             from_series=options.series.name, from_pocket="Proposed",
             to_series=options.series.name, to_pocket=options.pocket.title(),
@@ -75,46 +75,6 @@
         print("copyPackage %s: %s" % (display, e.content), file=sys.stderr)
         return False
 
-    try:
-        proposed_source = options.archive.getPublishedSources(
-            source_name=name, version=version,
-            distro_series=options.series, pocket="Proposed",
-            exact_match=True)[0]
-    except HTTPError as e:
-        print("getPublishedSources %s: %s" % (display, e.content),
-              file=sys.stderr)
-        return True
-    except IndexError:
-        print("getPublishedSources %s found no publication" % display,
-              file=sys.stderr)
-        return True
-
-    if architecture is None:
-        try:
-            proposed_source.requestDeletion(removal_comment="moved to %s" %
-                                            options.pocket)
-        except HTTPError as e:
-            print("requestDeletion %s: %s" % (display, e.content),
-                  file=sys.stderr)
-    else:
-        for bpph in proposed_source.getPublishedBinaries():
-            if bpph.is_debug:
-                continue
-            elif bpph.architecture_specific:
-                if architecture != bpph.distro_arch_series.architecture_tag:
-                    continue
-            else:
-                if architecture != "i386":
-                    continue
-            try:
-                bpph.requestDeletion(removal_comment="moved to %s" %
-                                     options.pocket)
-            except HTTPError as e:
-                print("requestDeletion %s/%s/%s: %s" %
-                      (bpph.binary_package_name, bpph.binary_package_version,
-                       bpph.distro_arch_series.architecture_tag, e.content),
-                      file=sys.stderr)
-
     return True