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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-09 21:27:15 UTC
  • mfrom: (2328.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
(Dmitry Vasiliev) Improvements to osutils functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
145
145
    return umask
146
146
 
147
147
 
 
148
_kind_marker_map = {
 
149
    "file": "",
 
150
    _directory_kind: "/",
 
151
    "symlink": "@",
 
152
}
148
153
def kind_marker(kind):
149
 
    if kind == 'file':
150
 
        return ''
151
 
    elif kind == _directory_kind:
152
 
        return '/'
153
 
    elif kind == 'symlink':
154
 
        return '@'
155
 
    else:
 
154
    try:
 
155
        return _kind_marker_map[kind]
 
156
    except KeyError:
156
157
        raise errors.BzrError('invalid file kind %r' % kind)
157
158
 
 
159
 
158
160
lexists = getattr(os.path, 'lexists', None)
159
161
if lexists is None:
160
162
    def lexists(f):
161
163
        try:
162
 
            if getattr(os, 'lstat') is not None:
163
 
                os.lstat(f)
164
 
            else:
165
 
                os.stat(f)
 
164
            stat = getattr(os, 'lstat', os.stat)
 
165
            stat(f)
166
166
            return True
167
 
        except OSError,e:
 
167
        except OSError, e:
168
168
            if e.errno == errno.ENOENT:
169
169
                return False;
170
170
            else:
518
518
    for dirname in dir_list:
519
519
        if is_inside(dirname, fname):
520
520
            return True
521
 
    else:
522
 
        return False
 
521
    return False
523
522
 
524
523
 
525
524
def is_inside_or_parent_of_any(dir_list, fname):
527
526
    for dirname in dir_list:
528
527
        if is_inside(dirname, fname) or is_inside(fname, dirname):
529
528
            return True
530
 
    else:
531
 
        return False
 
529
    return False
532
530
 
533
531
 
534
532
def pumpfile(fromfile, tofile):