/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/export.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-11 11:24:20 UTC
  • mfrom: (6973.3.5 less-file-id)
  • Revision ID: jelmer@jelmer.uk-20180611112420-n8g7s0xk77o90sbd
Merge lp:~jelmer/brz/less-file-id

Show diffs side-by-side

added added

removed removed

Lines of Context:
189
189
    # lookup, hopefully it isn't too expensive.
190
190
    to_fetch = []
191
191
    for dp, tp, ie in _export_iter_entries(tree, subdir):
 
192
        file_id = getattr(ie, 'file_id', None)
192
193
        fullpath = osutils.pathjoin(dest, dp)
193
194
        if ie.kind == "file":
194
 
            to_fetch.append((tp, (dp, tp, ie.file_id)))
 
195
            to_fetch.append((tp, (dp, tp, file_id)))
195
196
        elif ie.kind in ("directory", "tree-reference"):
196
197
            os.mkdir(fullpath)
197
198
        elif ie.kind == "symlink":
198
199
            try:
199
 
                symlink_target = tree.get_symlink_target(tp, ie.file_id)
 
200
                symlink_target = tree.get_symlink_target(tp, file_id)
200
201
                os.symlink(symlink_target, fullpath)
201
202
            except OSError as e:
202
203
                raise errors.BzrError(