Merge lp:~cjwatson/launchpad/contents-race into lp:launchpad
Proposed by
Colin Watson
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Colin Watson | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 17341 | ||||
Proposed branch: | lp:~cjwatson/launchpad/contents-race | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
391 lines (+158/-33) 7 files modified
lib/lp/archivepublisher/scripts/generate_contents_files.py (+5/-17) lib/lp/archivepublisher/scripts/publish_ftpmaster.py (+43/-1) lib/lp/archivepublisher/tests/test_generate_contents_files.py (+11/-10) lib/lp/archivepublisher/tests/test_publish_ftpmaster.py (+72/-1) lib/lp/registry/interfaces/distribution.py (+4/-1) lib/lp/registry/model/distribution.py (+7/-1) lib/lp/registry/tests/test_distribution.py (+16/-2) |
||||
To merge this branch: | bzr merge lp:~cjwatson/launchpad/contents-race | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
William Grant | code | Approve | |
Review via email: mp+249547@code.launchpad.net |
Commit message
Update Contents files in a way that doesn't suffer from races between generate-
Description of the change
Update Contents files in a way that doesn't suffer from races between generate-
To post a comment you must log in.
getSupportedSeries is probably not an ideal name, given that SeriesStatus. SUPPORTED exists.
Also, we might want to make the method itself less nonsensical. Experimental is an active series status, so it probably wants Contents files.