Merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt5 into lp://staging/bzr-builddeb
Proposed by
Jelmer Vernooij
| Status: | Merged |
|---|---|
| Approved by: | James Westby |
| Approved revision: | 587 |
| Merged at revision: | 581 |
| Proposed branch: | lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt5 |
| Merge into: | lp://staging/bzr-builddeb |
| Diff against target: |
922 lines (+198/-180) 11 files modified
cmds.py (+2/-2) dh_make.py (+1/-1) import_dsc.py (+48/-60) tests/test_import_dsc.py (+12/-12) tests/test_merge_package.py (+4/-4) tests/test_upstream.py (+35/-30) tests/test_util.py (+8/-6) upstream/__init__.py (+16/-15) upstream/branch.py (+2/-2) upstream/pristinetar.py (+64/-45) util.py (+6/-3) |
| To merge this branch: | bzr merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt5 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| James Westby | Approve | ||
|
Review via email:
|
|||
Description of the change
More work on support for multiple upstream tarballs.
Rename fetch_tarball -> fetch_tarballs as it can fetch multiple tarballs.
Some refactoring in import_dsc:
* Remove has_upstream_
* Pull some duplicate code into can_pull_
Pass component further down in some more places, including tarball_filename.
To post a comment you must log in.
Revision history for this message
| James Westby (james-w) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
