/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

Tags: bzr-1.6rc2
(jam) Fix handling of ENOTDIR for win32,
        and prepare the 1.6rc2 release.

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
""")
636
637
        try:
637
638
            children = os.listdir(self._tree.abspath(path))
638
639
        except OSError, e:
639
 
            if e.errno not in (errno.ENOENT, errno.ESRCH, errno.ENOTDIR):
 
640
            if not (osutils._is_error_enotdir(e)
 
641
                    or e.errno in (errno.ENOENT, errno.ESRCH)):
640
642
                raise
641
643
            return
642
 
            
 
644
 
643
645
        for child in children:
644
646
            childpath = joinpath(path, child)
645
647
            if self._tree.is_control_filename(childpath):