← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

Nathaniel McCallums patch for urandom friendliness on aix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
17
17
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
18
18
 
19
19
import os, types, re, time, errno, sys
20
 
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
21
 
        S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
 
20
from stat import S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE
22
21
 
23
22
from bzrlib.errors import BzrError
24
23
from bzrlib.trace import mutter
65
64
        return 'directory'
66
65
    elif S_ISLNK(mode):
67
66
        return 'symlink'
68
 
    elif S_ISCHR(mode):
69
 
        return 'chardev'
70
 
    elif S_ISBLK(mode):
71
 
        return 'block'
72
 
    elif S_ISFIFO(mode):
73
 
        return 'fifo'
74
 
    elif S_ISSOCK(mode):
75
 
        return 'socket'
76
67
    else:
77
 
        return 'unknown'
 
68
        raise BzrError("can't handle file kind with mode %o of %r" % (mode, f))
78
69
 
79
70
 
80
71
def kind_marker(kind):