Merge lp:~julian-edwards/launchpad/prevent-ddeb-copy-bug-747558 into lp:launchpad

[Julian Edwards]

[r=julian-edwards][bug=747558] Prevent copying of DDEBs into primary archives.

= Summary =
Prevent copying of DDEBs into primary archives.

== Proposed fix ==
Adds a check to the packagecopier to raise an error if the target archive
is a primary distro archive.

== Pre-implementation notes ==
This is required as part of finally allowing DDEBs to be published in PPAs
because putting DDEBs in the main archive causes the publisher to faint. Or
is that feint...

== Implementation details ==
See the diff, it's trivial.

== Tests ==
bin/test -cvv test_copypackage test_cannot_copy_ddebs

[Julian Edwards (julian-edwards)]

review: Approve

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2011-09-26 06:30:07 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2011-10-27 16:13:30 +0000
@@ -32,6 +32,7 @@
 from lp.soyuz.adapters.packagelocation import build_package_location
 from lp.soyuz.enums import (
     ArchivePurpose,
+    BinaryPackageFileType,
     SourcePackageFormat,
     )
 from lp.soyuz.interfaces.archive import CannotCopy
@@ -489,6 +490,10 @@
                 for binary_file in binary_pub.binarypackagerelease.files:
                     if binary_file.libraryfile.expires is not None:
                         raise CannotCopy('source has expired binaries')
+                    if (self.archive.is_main and
+                        binary_file.filetype == BinaryPackageFileType.DDEB):
+                        raise CannotCopy(
+                            "Cannot copy DDEBs to a primary archive")
 
         # Check if there is already a source with the same name and version
         # published in the destination archive.
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-09-26 06:30:07 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-10-27 16:13:30 +0000
@@ -790,6 +790,18 @@
             status=PackagePublishingStatus.PUBLISHED)
         self.assertCanCopyBinaries(delayed=True)
 
+    def test_cannot_copy_ddebs_to_primary_archives(self):
+        # The primary archive cannot (yet) cope with DDEBs, see bug
+        # 724237 and anything tagged "ddebs".
+        ppa = self.factory.makeArchive(purpose=ArchivePurpose.PPA)
+        self.archive = self.test_publisher.ubuntutest.main_archive
+        self.series = self.test_publisher.breezy_autotest
+        self.source = self.test_publisher.getPubSource(archive=ppa)
+        self.test_publisher.getPubBinaries(
+            pub_source=self.source, with_debug=True)
+        self.assertCannotCopyBinaries(
+            'Cannot copy DDEBs to a primary archive')
+
 
 class CopyCheckerTestCase(TestCaseWithFactory):