← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Martin
  • Date: 2010-05-16 15:18:43 UTC
  • mfrom: (5235 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5239.
  • Revision ID: gzlist@googlemail.com-20100516151843-lu53u7caehm3ie3i
Merge bzr.dev to resolve conflicts in NEWS and _chk_map_pyx

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
399
399
 
400
400
    def rename(self, rel_from, rel_to):
401
401
        path_from = self._abspath(rel_from)
 
402
        path_to = self._abspath(rel_to)
402
403
        try:
403
404
            # *don't* call bzrlib.osutils.rename, because we want to
404
 
            # detect errors on rename
405
 
            os.rename(path_from, self._abspath(rel_to))
 
405
            # detect conflicting names on rename, and osutils.rename tries to
 
406
            # mask cross-platform differences there
 
407
            os.rename(path_from, path_to)
406
408
        except (IOError, OSError),e:
407
409
            # TODO: What about path_to?
408
410
            self._translate_error(e, path_from)