bzr-builddeb

Merge lp:~afrantzis/bzr-builddeb/lp659585 into lp:bzr-builddeb

  1. lp659585
  2. Merge into trunk
Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 486
Proposed branch: lp:~afrantzis/bzr-builddeb/lp659585
Merge into: lp:bzr-builddeb
Diff against target: 12 lines (+1/-1)
1 file modified
import_dsc.py (+1/-1)
To merge this branch: bzr merge lp:~afrantzis/bzr-builddeb/lp659585
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+45229@code.launchpad.net

Description of the change

Fix LP #659585

To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

Great, thanks.

James

review: Approve

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 2010-09-10 02:37:09 +0000
3+++ import_dsc.py 2011-01-05 12:18:53 +0000
4@@ -1488,7 +1488,7 @@
5 "Should use self.upstream_branch if set"
6 assert isinstance(version, str), \
7 "Should pass version as str not %s" % str(type(version))
8- assert isinstance(previous_version, str), \
9+ assert isinstance(previous_version, str) or previous_version is None, \
10 "Should pass previous_version as str not %s" % str(
11 type(previous_version))
12 tempdir = tempfile.mkdtemp(dir=os.path.join(self.tree.basedir, '..'))

Subscribers

People subscribed via source and target branches