/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: Jelmer Vernooij
  • Date: 2011-08-22 15:22:57 UTC
  • mfrom: (6092 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6191.
  • Revision ID: jelmer@samba.org-20110822152257-6z7jx73i59npiauo
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
2178
2178
    return file_kind_from_stat_mode(mode)
2179
2179
file_kind_from_stat_mode = file_kind_from_stat_mode_thunk
2180
2180
 
2181
 
 
2182
 
def file_kind(f, _lstat=os.lstat):
 
2181
def file_stat(f, _lstat=os.lstat):
2183
2182
    try:
2184
 
        return file_kind_from_stat_mode(_lstat(f).st_mode)
 
2183
        # XXX cache?
 
2184
        return _lstat(f)
2185
2185
    except OSError, e:
2186
2186
        if getattr(e, 'errno', None) in (errno.ENOENT, errno.ENOTDIR):
2187
2187
            raise errors.NoSuchFile(f)
2188
2188
        raise
2189
2189
 
 
2190
def file_kind(f, _lstat=os.lstat):
 
2191
    stat_value = file_stat(f, _lstat)
 
2192
    return file_kind_from_stat_mode(stat_value.st_mode)
2190
2193
 
2191
2194
def until_no_eintr(f, *a, **kw):
2192
2195
    """Run f(*a, **kw), retrying if an EINTR error occurs.