/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: John Arbash Meinel
  • Date: 2008-08-13 22:51:55 UTC
  • mfrom: (3606.2.4 1.6)
  • mto: This revision was merged to the branch mainline in revision 3625.
  • Revision ID: john@arbash-meinel.com-20080813225155-t914z2fqyi072dd4
Bring in 1.6rc2, and update NEWS.

Some things that were IN DEVELOPMENT were released in bzr 1.6rc2.

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):