← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~cjwatson/launchpad/copy-custom-uploads into lp:launchpad

 

The proposal to merge lp:~cjwatson/launchpad/copy-custom-uploads into lp:launchpad has been updated.

Description changed to:

== Summary ==

One of the last bugs that cause Ubuntu archive administrators to still require access to lp_publish@cocoplum (a horrendously privileged account) is bug 231371: if we upload installer or upgrader images to -proposed, get them past verification, and copy them to -updates, we have to copy the custom files around by hand.  At the moment we have a pile of manual instructions in https://wiki.ubuntu.com/ArchiveAdministration#Moving_Packages_to_Updates for this, but obviously this should be automated.

== Proposed fix ==

A while back, Jeroen wrote CustomUploadsCopier, which deals with copying custom files across when we open a new distroseries.  I always rather suspected that it wouldn't be too difficult to hook it up to solve this problem too, and it looks as though I was right. :-)

This does make one aspect of direct copies behave a little bit like delayed copies in that they synthesise an upload, and I considered making this case trigger a delayed copy, but consensus seems to be that delayed copies should be removed at the earliest opportunity, and I can't say I disagree.  Besides, CustomUploadsCopier.copyUpload does enough of the work for us that I think it would actually be more code to reuse delayed copies for this.

== LOC Rationale ==

I got it down to +68 with a bit of judicious tidying up of unit tests.  Aside from that, this is part of the general arc of tidying up package copying described in https://code.launchpad.net/~cjwatson/launchpad/pcj-reupload/+merge/111124; as indicated there, even with the addition of this branch that's going to come out substantially LoC-negative.

== Tests ==

bin/test -vvct test_copypackage -t test_custom_uploads_copier -t test_factory -t test_publish_ftpmaster

== Demo and Q/A ==

This will involve two publisher runs on dogfood, so it won't be exactly fast, but it shouldn't be difficult.  Upload debian-installer to precise-proposed on dogfood, let it build, publish it, then use Archive.copyPackage (or 'sru-release -l dogfood' from lp:ubuntu-archive-tools) to copy it to precise-updates.  This should create the appropriate versioned subdirectories and "current" symlinks in dists/precise-updates/main/installer-*/.

== Lint ==

Just one pre-existing and not very interesting entry:

./lib/lp/soyuz/scripts/tests/test_copypackage.py
    1450: E501 line too long (82 characters)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/copy-custom-uploads/+merge/111653
-- 
https://code.launchpad.net/~cjwatson/launchpad/copy-custom-uploads/+merge/111653
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/copy-custom-uploads into lp:launchpad.


References