Rev 382: Merge bug fixes from Aaron. Note that these are untested and show untested parts of bzr-builddeb. in http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

[Robert Collins]

At http://people.canonical.com/~robertc/baz2.0/plugins/builddeb/trunk

------------------------------------------------------------
revno: 382 [merge]
revision-id: robertc at robertcollins.net-20091122031740-5ltc06vsc8zm2z7l
parent: robertc at robertcollins.net-20091113021729-8ql3oxigi7ra6130
parent: aaron at aaronbentley.com-20091112030450-3w9l01vwwmnsfe5l
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trunk
timestamp: Sun 2009-11-22 14:17:40 +1100
message:
  Merge bug fixes from Aaron. Note that these are untested and show untested parts of bzr-builddeb.
modified:
  cmds.py                        commands.py-20090212140847-xar6smw4yyx06egs-1
=== modified file 'cmds.py'
--- a/cmds.py	2009-11-11 06:22:42 +0000
+++ b/cmds.py	2009-11-12 03:04:50 +0000
@@ -729,9 +729,9 @@
                         raise BzrCommandError("Unable to find the tag for "
                                 "the previous upstream version, %s, in the "
                                 "branch: %s" % (last_version,
-                                    db.upstream_tag_name(last_version)))
+                                    db.upstream_tag_name(str(last_version))))
                     upstream_tip = db.revid_of_upstream_version_from_branch(
-                            last_version)
+                            last_version.upstream_version)
                     db.extract_upstream_tree(upstream_tip, tempdir)
                 else:
                     db._create_empty_upstream_tree(tempdir)