Launchpad itself

Merge lp://qastaging/~stevenk/launchpad/move-ifp-from-idistroseries into lp://qastaging/launchpad

move-ifp-from-idistroseries
Merge into devel

Proposed by Steve Kowalik on 2010-08-02

Status:

Merged

Approved by:

Steve Kowalik on 2010-08-06

Approved revision:

no longer in the source branch.

Merged at revision:

11336

Proposed branch:

lp://qastaging/~stevenk/launchpad/move-ifp-from-idistroseries

Merge into:

lp://qastaging/launchpad

Diff against target:

853 lines (+303/-351)

9 files modified

lib/lp/archiveuploader/tests/test_uploadprocessor.py (+6/-7)
lib/lp/registry/doc/distroseries.txt (+9/-11)
lib/lp/registry/interfaces/distroseries.py (+0/-29)
lib/lp/registry/model/distroseries.py (+2/-173)
lib/lp/soyuz/doc/initialise-from-parent.txt (+1/-4)
lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+7/-5)
lib/lp/soyuz/scripts/initialise_distroseries.py (+256/-0)
scripts/ftpmaster-tools/initialise-from-parent.py (+19/-104)
utilities/soyuz-sampledata-setup.py (+3/-18)

To merge this branch:

bzr merge lp://qastaging/~stevenk/launchpad/move-ifp-from-idistroseries

Related bugs:

Bug #239807: initialise-from-parent blindly copies PARTNER archive	High	Fix Released
Bug #612910: IDistroSeries.initialiseFromParent should be split out	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Jelmer Vernooij (community)	code	2010-08-02	Approve on 2010-08-05
Review via email: mp+31520@code.qastaging.launchpad.net

Commit message

Move IDistroSeries.initialiseFromParent() into lp.soyuz.scripts.initialise_distroseries.InitialiseDistroSeries and clean-up scripts/ftpmaster-tools/initialise-from-parent.py.

Description of the change

This branch shifts IDistroSeries.initialiseFromParent() out into its own seperate class, since it has nothing to do distroseries in general, and as a basis for future work.

I had a few pre-implementation chats with Julian about it, who mentioned it would be nice to drop the cursor() usage from the script, and generally clean up i-f-p, by moving the functions from the script into the new class, and to not behave badly and assert() on error.

It also fixes another bug as a drive-by -- it no longer copies PARTNER archives when initialising.

Running tests:

bin/test -vv -t test_uploadprocessor -t distroseries.txt -t initialise-from-parent.txt -t soyuz-set-of-uploads.txt

Lint: I cleaned up the majority of the lint warnings.

Blood Type: Don't know, and blame jtv for this bit. :-)

Revision history for this message

Jelmer Vernooij (jelmer) wrote on 2010-08-05:

Please add a docstring to InitialiseDistroSeries, perhaps based on the docstring for the original initialiseFromParent().

The module docstring of scripts/ftpmaster-tools/initialise-from-parent.py misses a tail dot.

I think the name InitialiseDistroSeries is a bit confusing (but the same applied to initialiseFromParent) as it suggests to me that it takes care of doing all of the initialization of the DistroSeries, not just the Soyuzy bits. I don't have any good suggestions, perhaps something like SetupDistroSeriesPackaging ?

review: Approve (code)