Bazaar

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

  1. trivial
  2. Merge into bzr.dev
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

Just a pretty obvious unbound local fix from https://code.launchpad.net/~xaav/loggerhead/export-tarball/+merge/66408

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
=== modified file 'bzrlib/export/tar_exporter.py'
--- bzrlib/export/tar_exporter.py 2011-06-28 13:54:56 +0000
+++ bzrlib/export/tar_exporter.py 2011-07-11 01:14:30 +0000
@@ -141,10 +141,10 @@
141 root_mtime = None141 root_mtime = None
142142
143 is_stdout = False143 is_stdout = False
144 basename = None
144 if fileobj is not None:145 if fileobj is not None:
145 stream = fileobj146 stream = fileobj
146 elif dest == '-':147 elif dest == '-':
147 basename = None
148 stream = sys.stdout148 stream = sys.stdout
149 is_stdout = True149 is_stdout = True
150 else:150 else: