Merge lp:~wgrant/launchpad/bug-707189-forgetful-copier into lp:launchpad

[William Grant]

[r=lifeless,stevenk][ui=none][bug=707189] PublishingSet.publishBinary now correctly checks whether a binary is already published, no longer erroneously skipping some architectures.

PublishingSet.publishBinary takes a target DistroArchSeries and creates publications as appropriate, including expanding it to cover all enabled architectures if the binary is architecture-independent. In doing so it first checks if the binary is already published -- if so, it will not create another publication.

The refactor in r12220 broke this, such that it now checks if the *requested* architecture is already published, instead of the target architecture. This means that architectures after nominated arch-indep alphabetically (ie. lpia) will not be have arch-indep publications created.

[Steve Kowalik (stevenk)]

review: Approve (code*)

[Robert Collins (lifeless)]

So, this bit is confusing:
+ # Now make a new distroseries with only i386.
+ nobby = self.createNobby(('i386', 'hppa'))

That and the code below suggest it creates two arches.

I wouldn't mind no comment, but if there is a comment, having it not match the code breaks my brain.

review: Approve

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2011-01-15 06:32:40 +0000
+++ lib/lp/soyuz/model/publishing.py	2011-01-25 08:03:47 +0000
@@ -1298,7 +1298,7 @@
             archive = debug_archive
 
         published_binaries = []
-        for arch in target_archs:
+        for target_arch in target_archs:
             # We only publish the binary if it doesn't already exist in
             # the destination. Note that this means we don't support
             # override changes on their own.
@@ -1306,11 +1306,11 @@
                 name=binarypackagerelease.name, exact_match=True,
                 version=binarypackagerelease.version,
                 status=active_publishing_status, pocket=pocket,
-                distroarchseries=distroarchseries)
+                distroarchseries=target_arch)
             if not bool(binaries_in_destination):
                 published_binaries.append(
                     getUtility(IPublishingSet).newBinaryPublication(
-                        archive, binarypackagerelease, arch, component,
+                        archive, binarypackagerelease, target_arch, component,
                         section, priority, pocket))
         return published_binaries
 

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-01-11 07:50:10 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-01-25 08:03:47 +0000
@@ -49,6 +49,7 @@
 from lp.soyuz.interfaces.publishing import (
     active_publishing_status,
     IBinaryPackagePublishingHistory,
+    IPublishingSet,
     ISourcePackagePublishingHistory,
     )
 from lp.soyuz.interfaces.queue import (
@@ -1085,6 +1086,36 @@
         # The binary should not be published for hppa.
         self.assertCopied(copies, nobby, ('i386',))
 
+    def test_copies_only_new_indep_publications(self):
+        # When copying  architecture-independent binaries to a series with
+        # existing publications in some architectures, new publications
+        # are only created in the missing archs.
+
+        # Make a new architecture-specific source and binary.
+        archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest, virtualized=False)
+        source = self.test_publisher.getPubSource(
+            archive=archive, architecturehintlist='all')
+        [bin_i386, bin_hppa] = self.test_publisher.getPubBinaries(
+            pub_source=source)
+
+        # Now make a new distroseries with two archs.
+        nobby = self.createNobby(('i386', 'hppa'))
+
+        target_archive = self.factory.makeArchive(
+            distribution=self.test_publisher.ubuntutest, virtualized=False)
+        # Manually copy the indep pub to just i386.
+        getUtility(IPublishingSet).newBinaryPublication(
+            target_archive, bin_i386.binarypackagerelease, nobby['i386'],
+            bin_i386.component, bin_i386.section, bin_i386.priority,
+            bin_i386.pocket)
+        # Now we can copy the package with binaries.
+        copies = self.doCopy(
+            source, target_archive, nobby, source.pocket, True)
+
+        # The copy succeeds, and no i386 publication is created.
+        self.assertCopied(copies, nobby, ('hppa',))
+
 
 class TestDoDelayedCopy(TestCaseWithFactory, BaseDoCopyTests):