Merge lp:~mbp/bzr/trivial into lp:bzr

Proposed by Martin Pool
Status: Merged
Approved by: Martin Pool
Approved revision: no longer in the source branch.
Merged at revision: 6019
Proposed branch: lp:~mbp/bzr/trivial
Merge into: lp:bzr
Diff against target: 15 lines (+1/-1)
1 file modified
bzrlib/export/tar_exporter.py (+1/-1)
To merge this branch: bzr merge lp:~mbp/bzr/trivial
Reviewer Review Type Date Requested Status
bzr-core Pending
Review via email: mp+67474@code.launchpad.net

Commit message

avoid unbound local error in export

Description of the change

To post a comment you must log in.
Revision history for this message
Martin Pool (mbp) wrote :

sent to pqm by email

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bzrlib/export/tar_exporter.py'
2--- bzrlib/export/tar_exporter.py 2011-06-28 13:54:56 +0000
3+++ bzrlib/export/tar_exporter.py 2011-07-11 01:14:30 +0000
4@@ -141,10 +141,10 @@
5 root_mtime = None
6
7 is_stdout = False
8+ basename = None
9 if fileobj is not None:
10 stream = fileobj
11 elif dest == '-':
12- basename = None
13 stream = sys.stdout
14 is_stdout = True
15 else: