launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:initialize-distroseries-pocket-details into launchpad:master.

Commit message:
Copy SECURITY/UPDATES into PROPOSED, not RELEASE

This matches Ubuntu policy as described by Adam Conrad: it allows
updates to go through proposed-migration.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/374136
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:initialize-distroseries-pocket-details into launchpad:master.

diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
index d266a84..4d59be2 100644
--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
@@ -60,8 +60,8 @@ class InitializationError(Exception):
 # need this because some pockets are unmodifiable in unreleased series.
 INIT_POCKETS = OrderedDict([
     (PackagePublishingPocket.RELEASE, PackagePublishingPocket.RELEASE),
-    (PackagePublishingPocket.SECURITY, PackagePublishingPocket.RELEASE),
-    (PackagePublishingPocket.UPDATES, PackagePublishingPocket.RELEASE),
+    (PackagePublishingPocket.SECURITY, PackagePublishingPocket.PROPOSED),
+    (PackagePublishingPocket.UPDATES, PackagePublishingPocket.PROPOSED),
     (PackagePublishingPocket.PROPOSED, PackagePublishingPocket.PROPOSED),
     ])
 
diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
index 25d2cb3..be2e3ff 100644
--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
@@ -385,7 +385,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
             [self.parent], previous_series=self.parent,
             distribution=self.parent.distribution)
         self.assertDistroSeriesInitializedCorrectly(
-            child, self.parent, self.parent_das)
+            child, self.parent, self.parent_das,
+            child_pocket=PackagePublishingPocket.PROPOSED)
 
     def test_success_with_updates_packages_copier(self):
         # Initialization using the copier copies all the packages from the
@@ -394,7 +395,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
             pocket=PackagePublishingPocket.UPDATES)
         child = self._fullInitialize([self.parent])
         self.assertDistroSeriesInitializedCorrectly(
-            child, self.parent, self.parent_das)
+            child, self.parent, self.parent_das,
+            child_pocket=PackagePublishingPocket.PROPOSED)
 
     def test_success_with_security_packages_cloner(self):
         # Initialization using the cloner copies all the packages from the
@@ -407,7 +409,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
             [self.parent], previous_series=self.parent,
             distribution=self.parent.distribution)
         self.assertDistroSeriesInitializedCorrectly(
-            child, self.parent, self.parent_das)
+            child, self.parent, self.parent_das,
+            child_pocket=PackagePublishingPocket.PROPOSED)
 
     def test_success_with_security_packages_copier(self):
         # Initialization using the copier copies all the packages from the
@@ -416,7 +419,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
             pocket=PackagePublishingPocket.SECURITY)
         child = self._fullInitialize([self.parent])
         self.assertDistroSeriesInitializedCorrectly(
-            child, self.parent, self.parent_das)
+            child, self.parent, self.parent_das,
+            child_pocket=PackagePublishingPocket.PROPOSED)
 
     def test_success_with_proposed_packages_cloner(self):
         # Initialization using the cloner copies all the packages from the