Merge lp:~jelmer/bzr-builddeb/fix-bz2-repack into lp:bzr-builddeb
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | James Westby |
Approved revision: | no longer in the source branch. |
Merged at revision: | 550 |
Proposed branch: | lp:~jelmer/bzr-builddeb/fix-bz2-repack |
Merge into: | lp:bzr-builddeb |
Diff against target: |
62 lines (+22/-4) 3 files modified
debian/changelog (+6/-0) tests/test_upstream.py (+14/-0) upstream/__init__.py (+2/-4) |
To merge this branch: | bzr merge lp:~jelmer/bzr-builddeb/fix-bz2-repack |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Westby | Approve | ||
Review via email: mp+54991@code.launchpad.net |
Description of the change
Fix repacking of bz2 tarballs during "bzr merge-upstream".
To post a comment you must log in.
Ping!
This still do double repacking of some tarballs but it's the simplest implementation in terms of code. I'd be happy to attack the double repacking as well, but preferably in a separate MP (it already happens at the moment, this just adds another codepath that triggers it).