[Pkg-bazaar-commits] ./bzr-builddeb/trunk r359: Fix the error when the upstream tag is missing during merge-upstream.

[James Westby]

------------------------------------------------------------
revno: 359
committer: James Westby <james.westby at canonical.com>
branch nick: trunk
timestamp: Sun 2009-07-26 18:58:03 +0200
message:
  Fix the error when the upstream tag is missing during merge-upstream.
  
  The error now tells the user more reliably what version is being used and
  what tag is being searched for.
modified:
  import_dsc.py
    ------------------------------------------------------------
    revno: 356.2.1
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sun 2009-07-26 18:44:17 +0200
    message:
      Use proper upstream version number in error message.
    modified:
      import_dsc.py
-------------- next part --------------
=== modified file 'import_dsc.py'
--- a/import_dsc.py	2009-07-26 08:05:34 +0000
+++ b/import_dsc.py	2009-07-26 16:44:17 +0000
@@ -1650,8 +1650,10 @@
                 else:
                     raise BzrCommandError("Unable to find the tag for the "
                             "previous upstream version, %s, in the branch: "
-                            "%s" % (previous_version,
-                                self.upstream_tag_name(previous_version)))
+                            "%s" % (
+                        previous_version.upstream_version,
+                        self.upstream_tag_name(
+                            previous_version.upstream_version)))
             else:
                 self._create_empty_upstream_tree(tempdir)
             if self.has_upstream_version_in_packaging_branch(version.upstream_version):