Merge lp://staging/~cjwatson/launchpad/ftparchive-release-contents into lp://staging/launchpad

Proposed by Colin Watson
Status: Merged
Merged at revision: 17407
Proposed branch: lp://staging/~cjwatson/launchpad/ftparchive-release-contents
Merge into: lp://staging/launchpad
Diff against target: 292 lines (+98/-25)
6 files modified
lib/lp/archivepublisher/publishing.py (+8/-2)
lib/lp/archivepublisher/scripts/publish_ftpmaster.py (+24/-12)
lib/lp/archivepublisher/scripts/publishdistro.py (+19/-6)
lib/lp/archivepublisher/tests/test_generate_contents_files.py (+17/-3)
lib/lp/archivepublisher/tests/test_publish_ftpmaster.py (+2/-1)
lib/lp/archivepublisher/tests/test_publisher.py (+28/-1)
To merge this branch: bzr merge lp://staging/~cjwatson/launchpad/ftparchive-release-contents
Reviewer Review Type Date Requested Status
William Grant (community) code Approve
Review via email: mp+253415@code.staging.launchpad.net

Commit message

List Contents-* in Release files if available.

Description of the change

List Contents-* in Release files if available.

This entailed a little refactoring. We have to make sure that updated Contents files are in place before writing Release files, and we have to make sure that if Contents files change then we republish the suite even if there's nothing else to do.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)
Revision history for this message
Colin Watson (cjwatson) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.