Launchpad itself

Merge ~cjwatson/launchpad:initialize-distroseries-pocket-details into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. initialize-distroseries-pocket-details
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 5006978d72f53be4f6382666633ccf2a23a2d006
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:initialize-distroseries-pocket-details
Merge into: launchpad:master
Diff against target: 59 lines (+10/-6)
2 files modified
lib/lp/soyuz/scripts/initialize_distroseries.py (+2/-2)
lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py (+8/-4)
Reviewer Review Type Date Requested Status
William Grant code Approve
Adam Conrad (community) Approve
Review via email: mp+374136@code.launchpad.net

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.

To post a comment you must log in.
Revision history for this message
Adam Conrad (adconrad) wrote :

LGTM

review: Approve
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/lib/lp/soyuz/scripts/initialize_distroseries.py b/lib/lp/soyuz/scripts/initialize_distroseries.py
2index d266a84..4d59be2 100644
3--- a/lib/lp/soyuz/scripts/initialize_distroseries.py
4+++ b/lib/lp/soyuz/scripts/initialize_distroseries.py
5@@ -60,8 +60,8 @@ class InitializationError(Exception):
6 # need this because some pockets are unmodifiable in unreleased series.
7 INIT_POCKETS = OrderedDict([
8 (PackagePublishingPocket.RELEASE, PackagePublishingPocket.RELEASE),
9- (PackagePublishingPocket.SECURITY, PackagePublishingPocket.RELEASE),
10- (PackagePublishingPocket.UPDATES, PackagePublishingPocket.RELEASE),
11+ (PackagePublishingPocket.SECURITY, PackagePublishingPocket.PROPOSED),
12+ (PackagePublishingPocket.UPDATES, PackagePublishingPocket.PROPOSED),
13 (PackagePublishingPocket.PROPOSED, PackagePublishingPocket.PROPOSED),
14 ])
15
16diff --git a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
17index 25d2cb3..be2e3ff 100644
18--- a/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
19+++ b/lib/lp/soyuz/scripts/tests/test_initialize_distroseries.py
20@@ -385,7 +385,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
21 [self.parent], previous_series=self.parent,
22 distribution=self.parent.distribution)
23 self.assertDistroSeriesInitializedCorrectly(
24- child, self.parent, self.parent_das)
25+ child, self.parent, self.parent_das,
26+ child_pocket=PackagePublishingPocket.PROPOSED)
27
28 def test_success_with_updates_packages_copier(self):
29 # Initialization using the copier copies all the packages from the
30@@ -394,7 +395,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
31 pocket=PackagePublishingPocket.UPDATES)
32 child = self._fullInitialize([self.parent])
33 self.assertDistroSeriesInitializedCorrectly(
34- child, self.parent, self.parent_das)
35+ child, self.parent, self.parent_das,
36+ child_pocket=PackagePublishingPocket.PROPOSED)
37
38 def test_success_with_security_packages_cloner(self):
39 # Initialization using the cloner copies all the packages from the
40@@ -407,7 +409,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
41 [self.parent], previous_series=self.parent,
42 distribution=self.parent.distribution)
43 self.assertDistroSeriesInitializedCorrectly(
44- child, self.parent, self.parent_das)
45+ child, self.parent, self.parent_das,
46+ child_pocket=PackagePublishingPocket.PROPOSED)
47
48 def test_success_with_security_packages_copier(self):
49 # Initialization using the copier copies all the packages from the
50@@ -416,7 +419,8 @@ class TestInitializeDistroSeries(InitializationHelperTestCase):
51 pocket=PackagePublishingPocket.SECURITY)
52 child = self._fullInitialize([self.parent])
53 self.assertDistroSeriesInitializedCorrectly(
54- child, self.parent, self.parent_das)
55+ child, self.parent, self.parent_das,
56+ child_pocket=PackagePublishingPocket.PROPOSED)
57
58 def test_success_with_proposed_packages_cloner(self):
59 # Initialization using the cloner copies all the packages from the

Subscribers

People subscribed via source and target branches

to status/vote changes: