Merge ~cjwatson/launchpad:ddtp-translations-en into launchpad:master
Proposed by
Colin Watson
Status: | Merged |
---|---|
Approved by: | Colin Watson |
Approved revision: | f506b902811acaee822c61e79387bc1b7907d1a7 |
Merge reported by: | Otto Co-Pilot |
Merged at revision: | not available |
Proposed branch: | ~cjwatson/launchpad:ddtp-translations-en |
Merge into: | launchpad:master |
Diff against target: |
194 lines (+85/-8) 4 files modified
lib/lp/archivepublisher/ddtp_tarball.py (+31/-2) lib/lp/archivepublisher/model/ftparchive.py (+1/-0) lib/lp/archivepublisher/publishing.py (+2/-1) lib/lp/archivepublisher/tests/test_ddtp_tarball.py (+51/-5) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ioana Lasc (community) | Approve | ||
Review via email: mp+410320@code.launchpad.net |
Commit message
Prevent Translation-en publishing collisions
Description of the change
If the series is configured to do so, the publisher may generate Translation-en files with long descriptions extracted from Packages files. However, it's also possible for DDTP tarballs to include Translation-en files, which then collide with the publisher when extracted and produce either assertion failures or inconsistent Release files depending on which one happened to win. Filter these out.
I fixed a ResourceWarning in passing.
To post a comment you must log in.
LGTM