Merge lp:~cjwatson/launchpad/634831-germinate-unhardcode into lp:launchpad
Status: | Merged |
---|---|
Approved by: | Jelmer Vernooij |
Approved revision: | no longer in the source branch. |
Merged at revision: | 12023 |
Proposed branch: | lp:~cjwatson/launchpad/634831-germinate-unhardcode |
Merge into: | lp:launchpad |
Diff against target: |
44 lines (+14/-9) 1 file modified
cronscripts/publishing/cron.germinate (+14/-9) |
To merge this branch: | bzr merge lp:~cjwatson/launchpad/634831-germinate-unhardcode |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jelmer Vernooij (community) | code | Approve | |
Review via email:
|
Commit message
[r=jelmer]
Description of the change
Summary
Bug 634831 asks for a change in germinate to make it possible to process input from multiple PPAs. This change is blocked because Launchpad's cron.germinate script relies on an internal implementation detail of germinate which now needs to change (perhaps not in exactly the way suggested in the patch for that bug, but it clearly needs to change somehow).
Proposed fix
The reason for this code in cron.germinate is to take copies of input files in case the archive changes under our feet (e.g. cron.germinate overlaps the next publisher run, or something like that). Currently, it just inserts them into germinate's current cached locations for archive.ubuntu.com URLs. Instead, it would be better to construct a local dists tree and point germinate at that using a file:// URL.
Pre-implementation notes
I haven't discussed this bug with anyone, sorry. This is partly because everyone keeps telling me the platform team owns cron.germinate. :-)
Implementation details
Nothing of note. I think this should be slightly faster than the previous implementation as it only decompresses Packages files once rather than once for each of the six seed collections (ubuntu kubuntu edubuntu xubuntu mythbuntu netbook).
Tests
cron.germinate has no proper tests, but it only generates a couple of output files and this patch shouldn't change them, so it's easy to confirm that. I tested this on mawson by taking a copy of the output directory (/srv/launchpad
Demo and Q/A
See the "Tests" section.