Merge lp:~robert-ancell/bzr-builddeb/bug-498078 into lp:bzr-builddeb

[Robert Ancell]

[James Westby (james-w)]

Looks good, merged.

Thanks,

James

review: Approve

=== modified file 'import_dsc.py'
--- import_dsc.py	2009-12-01 17:14:15 +0000
+++ import_dsc.py	2009-12-18 06:22:11 +0000
@@ -1628,8 +1628,8 @@
                 "Should use self.upstream_branch if set"
         tempdir = tempfile.mkdtemp(dir=os.path.join(self.tree.basedir, '..'))
         try:
-            previous_upstream_revision = get_snapshot_revision(previous_version.upstream_version)
             if previous_version is not None:
+                previous_upstream_revision = get_snapshot_revision(previous_version.upstream_version)
                 if self.has_upstream_version_in_packaging_branch(
                         previous_version.upstream_version):
                     upstream_tip = self.revid_of_upstream_version_from_branch(