bzr-builddeb

Merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt3 into lp://staging/bzr-builddeb

  1. multiple-upstream-tarballs-pt3
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: James Westby
Approved revision: 585
Merged at revision: 573
Proposed branch: lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt3
Merge into: lp://staging/bzr-builddeb
Diff against target: 888 lines (+186/-156)
6 files modified
cmds.py (+3/-3)
import_dsc.py (+49/-75)
tests/test_import_dsc.py (+71/-68)
tests/test_merge_package.py (+4/-4)
tests/test_util.py (+46/-0)
upstream/pristinetar.py (+13/-6)
To merge this branch: bzr merge lp://staging/~jelmer/bzr-builddeb/multiple-upstream-tarballs-pt3
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+64713@code.staging.launchpad.net

This proposal supersedes a proposal from 2011-06-15.

Description of the change

Another step towards support for multiple upstream tarballs. This simplifies some of the code in import_dsc.

It also adds support for tarballs everywhere but the places deep down where the actual work has to happen:

* PristineTarSource.has_version()
* DistributionBranch.import_upstream()
* extract_orig_tarballs()
* PristineTarSource.fetch_tarball().

Except for the last, these now raise MultipleUpstreamTarballs

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches