/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 bzrlib/transform.py

  • Committer: James Westby
  • Date: 2008-07-17 15:56:09 UTC
  • mto: (3566.1.1 bzr.ab.integration)
  • mto: This revision was merged to the branch mainline in revision 3567.
  • Revision ID: jw+debian@jameswestby.net-20080717155609-bvwrtxv3uhnlqvs6
Fixes from review. Thanks Aaron and John.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
354
354
        try:
355
355
            mode = os.stat(self._tree.abspath(old_path)).st_mode
356
356
        except OSError, e:
357
 
            if e.errno == errno.ENOENT:
358
 
                return
359
 
            elif e.errno == errno.ENOTDIR:
360
 
                # If the file is in a directory that was a file in
361
 
                # tree on disk ENOTDIR will be raised. This error tells
362
 
                # us that the file is not present on disk, so we handle
363
 
                # it the same as ENOENT. See bug 248448.
 
357
            if e.errno in (errno.ENOENT, errno.ENOTDIR):
 
358
                # Either old_path doesn't exist, or the parent of the
 
359
                # target is not a directory (but will be one eventually)
 
360
                # Either way, we know it doesn't exist *right now*
 
361
                # See also bug #248448
364
362
                return
365
363
            else:
366
364
                raise