Merge lp:~julian-edwards/launchpad/publish-copy-archives-bug-520520-publish-distro into lp:launchpad

[Julian Edwards]

Add support for publishing of copy archives to the publish-distro script.

[Julian Edwards (julian-edwards)]

This is a simple branch that adds support for publishing of copy archives to
the publish-distro script.

It adds the option --copy-archive which will cause all archives with
ArchivePurpose.COPY to be published, provided their "publish" flag is set.

There's also a simple test case added.

[Jeroen T. Vermeulen (jtv)]

It's a shame the is_empty equivalent on the result set does not work. The only change I'm requesting is an XXX for that. Otherwise, all good.

review: Approve (code)

=== modified file 'lib/lp/soyuz/scripts/publishdistro.py'
--- lib/lp/soyuz/scripts/publishdistro.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/publishdistro.py	2010-02-24 11:55:28 +0000
@@ -69,6 +69,11 @@
                       dest="partner", metavar="PARTNER", default=False,
                       help="Run only over the partner archive.")
 
+    parser.add_option("--copy-archive", action="store_true",
+                      dest="copy_archive", metavar="COPYARCHIVE",
+                      default=False,
+                      help="Run only over the copy archives.")
+
     parser.add_option(
         "--primary-debug", action="store_true", default=False,
         dest="primary_debug", metavar="PRIMARYDEBUG",
@@ -103,12 +108,13 @@
 
     exclusive_options = (
         options.partner, options.ppa, options.private_ppa,
-        options.primary_debug)
+        options.primary_debug, options.copy_archive)
+
     num_exclusive = [flag for flag in exclusive_options if flag]
     if len(num_exclusive) > 1:
         raise LaunchpadScriptFailure(
-            "Can only specify one of partner, ppa, private-ppa and "
-            "primary-debug.")
+            "Can only specify one of partner, ppa, private-ppa, copy-archive"
+            " and primary-debug.")
 
     log.debug("  Distribution: %s" % options.distribution)
     log.debug("    Publishing: %s" % careful_msg(options.careful_publishing))
@@ -161,6 +167,14 @@
             raise LaunchpadScriptFailure(
                 "Could not find DEBUG archive for %s" % distribution.name)
         archives = [debug_archive]
+    elif options.copy_archive:
+        archives = getUtility(IArchiveSet).getArchivesForDistribution(
+            distribution, purposes=[ArchivePurpose.COPY])
+        # XXX 2010-02-24 Julian bug=246200
+        # Fix this to use bool when Storm fixes __nonzero__ on sqlobj
+        # result sets.
+        if archives.count() == 0:
+            raise LaunchpadScriptFailure("Could not find any COPY archives")
     else:
         archives = [distribution.main_archive]
 
@@ -185,9 +199,9 @@
         try_and_commit("dominating", publisher.B_dominate,
                        options.careful or options.careful_domination)
 
-        # The primary archive uses apt-ftparchive to generate the indexes,
-        # everything else uses the newer internal LP code.
-        if archive.purpose == ArchivePurpose.PRIMARY:
+        # The primary and copy archives use apt-ftparchive to generate the
+        # indexes, everything else uses the newer internal LP code.
+        if archive.purpose in (ArchivePurpose.PRIMARY, ArchivePurpose.COPY):
             try_and_commit("doing apt-ftparchive", publisher.C_doFTPArchive,
                            options.careful or options.careful_apt)
         else:
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_publishdistro.py'
--- lib/lp/soyuz/scripts/tests/test_publishdistro.py	2009-06-25 04:06:00 +0000
+++ lib/lp/soyuz/scripts/tests/test_publishdistro.py	2010-02-24 11:55:28 +0000
@@ -308,6 +308,47 @@
         self.assertEqual(
             open(debug_index_path).readlines()[0], 'Package: foo-bin\n')
 
+    def testPublishCopyArchive(self):
+        """Run publish-distro in copy archive mode.
+
+        It should only publish copy archives.
+        """
+        ubuntutest = getUtility(IDistributionSet)['ubuntutest']
+        cprov = getUtility(IPersonSet).getByName('cprov')
+        copy_archive_name = 'test-copy-publish'
+
+        # The COPY repository path is not created yet.
+        repo_path = os.path.join(
+            config.archivepublisher.root,
+            ubuntutest.name + '-' + copy_archive_name)
+        self.assertNotExists(repo_path)
+
+        copy_archive = getUtility(IArchiveSet).new(
+            distribution=ubuntutest, owner=cprov, name=copy_archive_name,
+            purpose=ArchivePurpose.COPY, enabled=True)
+        # Save some test CPU cycles by avoiding logging in as the user
+        # necessary to alter the publish flag.
+        removeSecurityProxy(copy_archive).publish = True
+
+        # Publish something.
+        pub_source =  self.getPubSource(
+            sourcename='baz', filecontent='baz', archive=copy_archive)
+
+        # Try a plain PPA run, to ensure the copy archive is not published.
+        self.runPublishDistro(['--ppa'])
+
+        self.assertEqual(pub_source.status, PackagePublishingStatus.PENDING)
+
+        # Now publish the copy archives and make sure they are really
+        # published.
+        self.runPublishDistro(['--copy-archive'])
+
+        self.assertEqual(pub_source.status, PackagePublishingStatus.PUBLISHED)
+
+        # Make sure that the files were published in the right place.
+        pool_path = os.path.join(repo_path, 'pool/main/b/baz/baz_666.dsc')
+        self.assertExists(pool_path)
+
     def testRunWithEmptySuites(self):
         """Try a publish-distro run on empty suites in careful_apt mode
 
@@ -347,7 +388,8 @@
         """Test that some command line options are mutually exclusive."""
         self.assertRaises(
             LaunchpadScriptFailure,
-            self.runPublishDistro, ['--ppa', '--partner', '--primary-debug'])
+            self.runPublishDistro,
+            ['--ppa', '--partner', '--primary-debug', '--copy-archive'])
         self.assertRaises(
             LaunchpadScriptFailure,
             self.runPublishDistro, ['--ppa', '--partner'])
@@ -359,10 +401,19 @@
             self.runPublishDistro, ['--ppa', '--primary-debug'])
         self.assertRaises(
             LaunchpadScriptFailure,
+            self.runPublishDistro, ['--ppa', '--copy-archive'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
             self.runPublishDistro, ['--partner', '--private-ppa'])
         self.assertRaises(
             LaunchpadScriptFailure,
             self.runPublishDistro, ['--partner', '--primary-debug'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
+            self.runPublishDistro, ['--partner', '--copy-archive'])
+        self.assertRaises(
+            LaunchpadScriptFailure,
+            self.runPublishDistro, ['--primary-debug', '--copy-archive'])
 
 
 def test_suite():