Merge lp:~wgrant/launchpad/maybe-publish-debug-symbols-db into lp:launchpad/db-devel

[William Grant]

Add Archive.publish_debug_symbols to the DB.

The Ubuntu primary archive needs to build ddebs, but we don't have the space or need to publish them to the archive tree right now. So add an Archive.publish_debug_symbols to the DB to control publishing separately from building.

=== added file 'database/schema/patch-2209-45-0.sql'
--- database/schema/patch-2209-45-0.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2209-45-0.sql	2013-05-14 09:27:28 +0000
@@ -0,0 +1,9 @@
+-- Copyright 2013 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+
+SET client_min_messages=ERROR;
+
+ALTER TABLE archive ADD COLUMN publish_debug_symbols boolean;
+ALTER TABLE archive ALTER COLUMN publish_debug_symbols SET DEFAULT false;
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 45, 0);

=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2013-05-08 06:18:50 +0000
+++ lib/lp/soyuz/model/publishing.py	2013-05-14 09:27:28 +0000
@@ -1159,6 +1159,12 @@
                                  "component, section, priority and/or "
                                  "phased_update_percentage.")
 
+        bpr = self.binarypackagerelease
+        if bpr.binpackageformat == BinaryPackageFormat.DDEB:
+            raise OverrideError(
+                "Cannot override ddeb publications directly; override "
+                "the corresponding deb instead.")
+
         # Check there is a change to make
         if new_component is None:
             new_component = self.component
@@ -1300,6 +1306,12 @@
                 "Cannot delete publications from suite '%s'" %
                 self.distroseries.getSuite(self.pocket))
 
+        bpr = self.binarypackagerelease
+        if bpr.binpackageformat == BinaryPackageFormat.DDEB:
+            raise DeletionError(
+                "Cannot delete ddeb publications directly; delete the "
+                "corresponding deb instead.")
+
         self.setDeleted(removed_by, removal_comment)
 
     def binaryFileUrls(self, include_meta=False):

=== modified file 'lib/lp/soyuz/tests/test_publishing.py'
--- lib/lp/soyuz/tests/test_publishing.py	2013-05-08 06:08:37 +0000
+++ lib/lp/soyuz/tests/test_publishing.py	2013-05-14 09:27:28 +0000
@@ -1056,6 +1056,22 @@
             [new_bpph])
         self.assertEqual(new_debug_bpph.section, new_section)
 
+    def test_requestDeletion_forbids_debug_package(self):
+        bpph, debug_bpph = self.factory.makeBinaryPackagePublishingHistory(
+            pocket=PackagePublishingPocket.RELEASE, with_debug=True)
+        self.assertRaisesWithContent(
+            DeletionError, "Cannot delete ddeb publications directly; delete "
+            "the corresponding deb instead.",
+            debug_bpph.requestDeletion, self.factory.makePerson())
+
+    def test_changeOverride_forbids_debug_package(self):
+        bpph, debug_bpph = self.factory.makeBinaryPackagePublishingHistory(
+            pocket=PackagePublishingPocket.RELEASE, with_debug=True)
+        self.assertRaisesWithContent(
+            OverrideError, "Cannot override ddeb publications directly; "
+            "override the corresponding deb instead.",
+            debug_bpph.changeOverride, new_phased_update_percentage=20)
+
 
 class TestSourceDomination(TestNativePublishingBase):
     """Test SourcePackagePublishingHistory.supersede() operates correctly."""

=== modified file 'lib/lp/testing/__init__.py'
--- lib/lp/testing/__init__.py	2012-12-26 01:34:53 +0000
+++ lib/lp/testing/__init__.py	2013-05-14 09:27:28 +0000
@@ -573,13 +573,13 @@
         self.assertThat(iter1, MatchesSetwise(*(map(Equals, iter2))))
 
     def assertRaisesWithContent(self, exception, exception_content,
-                                func, *args):
+                                func, *args, **kwargs):
         """Check if the given exception is raised with given content.
 
         If the exception isn't raised or the exception_content doesn't
         match what was raised an AssertionError is raised.
         """
-        err = self.assertRaises(exception, func, *args)
+        err = self.assertRaises(exception, func, *args, **kwargs)
         self.assertEqual(exception_content, str(err))
 
     def assertBetween(self, lower_bound, variable, upper_bound):