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

[Jelmer Vernooij]

[Jelmer Vernooij (jelmer)]

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

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-07-26 08:05:34 +0000
+++ 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):