/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/workingtree_4.py

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
99
99
# This is the Windows equivalent of ENOTDIR
100
100
# It is defined in pywin32.winerror, but we don't want a strong dependency for
101
101
# just an error code.
102
 
ERROR_PATH_NOT_FOUND = 3
103
102
ERROR_DIRECTORY = 267
104
103
 
105
104
 
2083
2082
                    # python 2.5 has e.errno == EINVAL,
2084
2083
                    #            and e.winerror == ERROR_DIRECTORY
2085
2084
                    e_winerror = getattr(e, 'winerror', None)
2086
 
                    win_errors = (ERROR_DIRECTORY, ERROR_PATH_NOT_FOUND)
2087
2085
                    # there may be directories in the inventory even though
2088
2086
                    # this path is not a file on disk: so mark it as end of
2089
2087
                    # iterator
2090
2088
                    if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
2091
2089
                        current_dir_info = None
2092
2090
                    elif (sys.platform == 'win32'
2093
 
                          and (e.errno in win_errors
2094
 
                               or e_winerror in win_errors)):
 
2091
                          and ERROR_DIRECTORY in (e.errno, e_winerror)):
2095
2092
                        current_dir_info = None
2096
2093
                    else:
2097
2094
                        raise