Merge lp:~wgrant/launchpad/really-publish-ppa-ddebs into lp:launchpad

[William Grant]

Don't skip DDEB publication for PPAs.

PPA ddeb (debug symbol package) publication is currently disabled. The record is marked as published, but the file is never written to disk.

This is the case because publication of DDEBs was going to be restricted on a per-PPA basis. But we're now going to restrict building instead, so publication should be turned back on unconditionally. This branch deletes the code and test for skipping DDEB publication.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-06-22 16:08:05 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-07-12 06:44:37 +0000
@@ -83,12 +83,6 @@
 
     def publish(self, diskpool, log):
         """See IFilePublishing."""
-        # DDEB publication for PPAs is temporarily disabled, see bug #399444.
-        if (self.archive.is_ppa and
-            self.libraryfilealiasfilename.endswith('.ddeb')):
-            log.debug('Skipping DDEB disk publication.')
-            return
-
         # XXX cprov 2006-06-12 bug=49510: The encode should not be needed
         # when retrieving data from DB.
         source = self.sourcepackagename.encode('utf-8')

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2010-05-05 14:50:42 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2010-07-12 06:44:37 +0000
@@ -578,24 +578,6 @@
         pool_path = "%s/main/f/foo/foo-bin_666_all.deb" % self.pool_dir
         self.assertEqual(open(pool_path).read().strip(), 'Hello world')
 
-    def test_publish_ddeb_for_ppas(self):
-        # DDEB publications in PPAs result in a PUBLISHED publishing record
-        # but the corresponding files are *not* dumped in the disk pool/.
-        cprov = getUtility(IPersonSet).getByName('cprov')
-        pub_binary = self.getPubBinaries(
-            filecontent='Hello world', format=BinaryPackageFormat.DDEB,
-            archive=cprov.archive)[0]
-
-        # Publication happens in the database domain.
-        pub_binary.publish(self.disk_pool, self.logger)
-        self.assertEqual(
-            PackagePublishingStatus.PUBLISHED,
-            pub_binary.status)
-
-        # But the DDEB isn't dumped to the repository pool/.
-        pool_path = "%s/main/f/foo/foo-bin_666_all.ddeb" % self.pool_dir
-        self.assertFalse(os.path.exists(pool_path))
-
     def testPublishingOverwriteFileInPool(self):
         """Test if publishOne refuses to overwrite a file in pool.