Merge lp:~michael.nelson/launchpad/529926-partner-override-to-main into lp:launchpad

[Michael Nelson]

Uploads that are overridden to a component requiring a different archive will be published in the correct archive context.

Fixes bug 529926 by ensuring that when the component of a source package upload is overridden, the target archive of the upload is also overridden as necessary.

This only becomes apparent when a "main" archive is uploaded and overridden to "partner" (or debug, I assume, any component that has a separate archive). In this case the source package release was being overridden correctly, but it is the package upload's archive that is used to create the new publishings.

Pre-implementation notes on the bug, and I chatted with Julian about this as well.

I was originally planning simply to use the SourcePackageRelease.upload_archive as the target for the publishing, but delayed copies actually re-use IPackageUpload to store the intended target archive. So rather than having conditional code for the target archive dependent on IPackageUpload.is_delayed_upload, I've updated the archive on the IPackageUpload itself.

To test:
bin/test -vv -m lp.archiveuploader

[Brad Crittenden (bac)]

Michael can you resolve the conflicts in your branch? I gave it a try but failed.

review: Needs Information

[Michael Nelson (michael.nelson)]

Thanks for taking a look Brad even when I wasn't around. I've re-merged, resolved and pushed, but am guessing you're finished your OCR now... I'll see if someone else can take a look in the mean time.

[Paul Hummer (rockstar)]

Thanks for the branch. These changes look good.

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue.txt'
--- lib/lp/soyuz/doc/distroseriesqueue.txt	2010-03-11 13:35:11 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue.txt	2010-03-23 07:48:33 +0000
@@ -109,7 +109,7 @@
   ...         print source.sourcepackagerelease.name
   ...     pub_records = item.realiseUpload(mock_logger)
   ed
-  DEBUG: Publishing source ed/0.2-20 to ubuntu/hoary
+  DEBUG: Publishing source ed/0.2-20 to ubuntu/hoary in the primary archive
   DEBUG: Publishing build to ubuntu/hoary/i386
   DEBUG: ... ed/0.2-20 (Arch Specific)
 

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-03-17 12:14:36 +0000
+++ lib/lp/soyuz/model/queue.py	2010-03-23 07:48:33 +0000
@@ -1318,7 +1318,12 @@
             source.sourcepackagerelease.override(
                 component=new_component, section=new_section)
 
-        return self.sources.count() > 0
+        # We override our own archive too, as it is used to create
+        # the SPPH during publish().
+        self.archive = self.distroseries.distribution.getArchiveByComponent(
+            new_component.name)
+
+        return True
 
     def overrideBinaries(self, new_component, new_section, new_priority,
                          allowed_components):
@@ -1546,7 +1551,6 @@
         """See `IPackageUploadSource`."""
         distroseries = self.packageupload.distroseries
         component = self.sourcepackagerelease.component
-        section = self.sourcepackagerelease.section
 
         if self.packageupload.is_delayed_copy:
             # For a delayed copy the component will not yet have
@@ -1576,11 +1580,12 @@
     def publish(self, logger=None):
         """See `IPackageUploadSource`."""
         # Publish myself in the distroseries pointed at by my queue item.
-        debug(logger, "Publishing source %s/%s to %s/%s" % (
+        debug(logger, "Publishing source %s/%s to %s/%s in the %s archive" % (
             self.sourcepackagerelease.name,
             self.sourcepackagerelease.version,
             self.packageupload.distroseries.distribution.name,
-            self.packageupload.distroseries.name))
+            self.packageupload.distroseries.name,
+            self.packageupload.archive.name))
 
         return getUtility(IPublishingSet).newSourcePublication(
             archive=self.packageupload.archive,

=== modified file 'lib/lp/soyuz/scripts/queue.py'
--- lib/lp/soyuz/scripts/queue.py	2010-02-09 00:17:40 +0000
+++ lib/lp/soyuz/scripts/queue.py	2010-03-23 07:48:33 +0000
@@ -567,11 +567,15 @@
             raise QueueActionError('Not Found: %s' % info)
 
         for queue_item in self.items:
-            # There's usually only one item in queue_item.sources.
-            for source in queue_item.sources:
-                source.sourcepackagerelease.override(component=component,
-                                                     section=section)
-                self.displayInfo(queue_item)
+            # We delegate to the queue_item itself to override any/all
+            # of its sources.
+            if queue_item.contains_source:
+                queue_item.overrideSource(
+                    component, section, [
+                        component,
+                        queue_item.sourcepackagerelease.component
+                        ])
+            self.displayInfo(queue_item)
 
     def _override_binary(self):
         """Overrides binarypackagereleases selected"""

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2010-03-13 00:32:40 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-03-23 07:48:33 +0000
@@ -20,6 +20,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.mail import stub
 from lp.soyuz.interfaces.archive import ArchivePurpose
+from lp.soyuz.interfaces.component import IComponentSet
 from lp.soyuz.interfaces.publishing import PackagePublishingStatus
 from lp.soyuz.interfaces.queue import (
     IPackageUploadSet, PackageUploadCustomFormat, PackageUploadStatus)
@@ -297,6 +298,38 @@
         self.assertEquals(
             BuildStatus.NEEDSBUILD, build.buildstate)
 
+    def test_realiseUpload_for_overridden_component_archive(self):
+        # If the component of an upload is overridden to 'Partner' for
+        # example, then the new publishing record should be for the
+        # partner archive.
+        self.test_publisher.prepareBreezyAutotest()
+
+        # Get some sample changes file content for the new upload.
+        changes_file = open(
+            datadir('suite/bar_1.0-1/bar_1.0-1_source.changes'))
+        changes_file_content = changes_file.read()
+        changes_file.close()
+
+        main_upload_release = self.test_publisher.getPubSource(
+            sourcename='main-upload', spr_only=True,
+            component='main', changes_file_content=changes_file_content)
+        package_upload = main_upload_release.package_upload
+
+        self.assertEqual("primary", main_upload_release.upload_archive.name)
+
+        # Override the upload to partner and verify the change.
+        partner_component = getUtility(IComponentSet)['partner']
+        main_component = getUtility(IComponentSet)['main']
+        package_upload.overrideSource(
+            partner_component, None, [partner_component, main_component])
+        self.assertEqual(
+            "partner", main_upload_release.upload_archive.name)
+
+        # Now realise the upload and verify that the publishing is for
+        # the partner archive.
+        pub = package_upload.realiseUpload()[0]
+        self.assertEqual("partner", pub.archive.name)
+
 
 def test_suite():
     return unittest.TestLoader().loadTestsFromName(__name__)