← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-07-21 15:15:53 UTC
  • mfrom: (3566.1.2 bzr.ab.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
Fix file -> directory handling (jwestby, #248448)

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:
 
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
358
362
                return
359
363
            else:
360
364
                raise