launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/optimise-binary-deletion into lp:launchpad.

Commit message:
Optimise non-SQL time in PublishingSet.requestDeletion.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #1682096 in Launchpad itself: "Removing gcc-6-cross-ports times out"
  https://bugs.launchpad.net/launchpad/+bug/1682096

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/optimise-binary-deletion/+merge/322443
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/optimise-binary-deletion into lp:launchpad.

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2016-10-02 12:38:58 +0000
+++ lib/lp/soyuz/model/publishing.py	2017-04-12 11:34:08 +0000
@@ -1688,9 +1688,8 @@
         # Append the sources' related binaries to our condemned list,
         # and mark them all deleted.
         bpph_ids = [bpph.id for bpph in binaries]
-        bpph_ids.extend(
-            bpph.id for source, bpph, bin, bin_name, arch
-            in self.getBinaryPublicationsForSources(sources))
+        bpph_ids.extend(self.getBinaryPublicationsForSources(sources).values(
+            BinaryPackagePublishingHistory.id))
         if len(bpph_ids) > 0:
             self.setMultipleDeleted(
                 BinaryPackagePublishingHistory, bpph_ids, removed_by,