bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/fix-version-in-error into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

  1. fix-version-in-error
  2. Merge into trunk-old
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: not available
Proposed branch: lp:~jelmer/bzr-builddeb/fix-version-in-error
Merge into: lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old
Diff against target: None lines
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/fix-version-in-error
Reviewer Review Type Date Requested Status
Bzr-builddeb-hackers Pending
Review via email: mp+9295@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jelmer Vernooij (jelmer) wrote :

Trivial fix to display the right upstream version and tag name when unable to find the previous upstream version tag.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import_dsc.py'
2--- import_dsc.py 2009-07-26 08:05:34 +0000
3+++ import_dsc.py 2009-07-26 16:44:17 +0000
4@@ -1650,8 +1650,10 @@
5 else:
6 raise BzrCommandError("Unable to find the tag for the "
7 "previous upstream version, %s, in the branch: "
8- "%s" % (previous_version,
9- self.upstream_tag_name(previous_version)))
10+ "%s" % (
11+ previous_version.upstream_version,
12+ self.upstream_tag_name(
13+ previous_version.upstream_version)))
14 else:
15 self._create_empty_upstream_tree(tempdir)
16 if self.has_upstream_version_in_packaging_branch(version.upstream_version):

Subscribers

People subscribed via source and target branches