bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/merge-fix-ancestry-warn into lp:bzr-builddeb

  1. merge-fix-ancestry-warn
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 703
Proposed branch: lp:~jelmer/bzr-builddeb/merge-fix-ancestry-warn
Merge into: lp:bzr-builddeb
Diff against target: 20 lines (+8/-2)
1 file modified
__init__.py (+8/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/merge-fix-ancestry-warn
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+89168@code.launchpad.net

Description of the change

If the pristine tar data can't be found, warn the user and continue rather than blowing up.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '__init__.py'
2--- __init__.py 2012-01-16 19:13:48 +0000
3+++ __init__.py 2012-01-19 00:18:23 +0000
4@@ -310,8 +310,14 @@
5 other_config = debuild_config(merger.other_tree, merger.other_tree)
6 if not (this_config.build_type == BUILD_TYPE_NATIVE or
7 other_config.build_type == BUILD_TYPE_NATIVE):
8- fix_ancestry_as_needed(merger.this_tree, merger.other_branch,
9- source_revid=merger.other_tree.get_revision_id())
10+ from bzrlib import trace
11+ from bzrlib.plugins.builddeb.errors import PackageVersionNotPresent
12+ try:
13+ fix_ancestry_as_needed(merger.this_tree, merger.other_branch,
14+ source_revid=merger.other_tree.get_revision_id())
15+ except PackageVersionNotPresent, e:
16+ trace.warning("Not fixing branch ancestry, missing pristine tar "
17+ "data for version %s", e.version)
18
19
20 try:

Subscribers

People subscribed via source and target branches