/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/dir_exporter.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/export/dir_exporter.py
62
62
            os.mkdir(fullpath)
63
63
        elif ie.kind == "symlink":
64
64
            try:
65
 
                symlink_target = tree.get_symlink_target(ie.file_id, tp)
 
65
                symlink_target = tree.get_symlink_target(tp, ie.file_id)
66
66
                os.symlink(symlink_target, fullpath)
67
67
            except OSError as e:
68
68
                raise errors.BzrError(
80
80
        fullpath = osutils.pathjoin(dest, relpath)
81
81
        # We set the mode and let the umask sort out the file info
82
82
        mode = 0o666
83
 
        if tree.is_executable(file_id, treepath):
 
83
        if tree.is_executable(treepath, file_id):
84
84
            mode = 0o777
85
85
        out = os.fdopen(os.open(fullpath, flags, mode), 'wb')
86
86
        try:
90
90
        if force_mtime is not None:
91
91
            mtime = force_mtime
92
92
        else:
93
 
            mtime = tree.get_file_mtime(file_id, treepath)
 
93
            mtime = tree.get_file_mtime(treepath, file_id)
94
94
        os.utime(fullpath, (mtime, mtime))
95
95
 
96
96
        yield