/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-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/export.py
197
197
            os.mkdir(fullpath)
198
198
        elif ie.kind == "symlink":
199
199
            try:
200
 
                symlink_target = tree.get_symlink_target(tp, file_id)
 
200
                symlink_target = tree.get_symlink_target(tp)
201
201
                os.symlink(symlink_target, fullpath)
202
202
            except OSError as e:
203
203
                raise errors.BzrError(
215
215
        fullpath = osutils.pathjoin(dest, relpath)
216
216
        # We set the mode and let the umask sort out the file info
217
217
        mode = 0o666
218
 
        if tree.is_executable(treepath, file_id):
 
218
        if tree.is_executable(treepath):
219
219
            mode = 0o777
220
220
        with os.fdopen(os.open(fullpath, flags, mode), 'wb') as out:
221
221
            out.writelines(chunks)
222
222
        if force_mtime is not None:
223
223
            mtime = force_mtime
224
224
        else:
225
 
            mtime = tree.get_file_mtime(treepath, file_id)
 
225
            mtime = tree.get_file_mtime(treepath)
226
226
        os.utime(fullpath, (mtime, mtime))
227
227
 
228
228
        yield