← 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-08-13 23:25:40 UTC
  • mfrom: (3624.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
(jam) Bring 1.6rc2 back into bzr.dev, and fix up NEWS entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
27
27
    delta,
28
28
    errors,
29
29
    inventory,
 
30
    osutils,
30
31
    revision as _mod_revision,
31
32
    )
32
33
""")
655
656
        try:
656
657
            children = os.listdir(self._tree.abspath(path))
657
658
        except OSError, e:
658
 
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
 
659
            if not (osutils._is_error_enotdir(e)
 
660
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
659
661
                raise
660
662
            return
661
 
            
 
663
 
662
664
        for child in children:
663
665
            childpath = joinpath(path, child)
664
666
            if self._tree.is_control_filename(childpath):