← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
51
51
    cache_utf8,
52
52
    errors,
53
53
    win32utils,
 
54
    trace,
54
55
    )
 
56
 
55
57
""")
56
58
 
57
59
# sha and md5 modules are deprecated in python2.6 but hashlib is available as
1349
1351
    normalized_filename = _inaccessible_normalized_filename
1350
1352
 
1351
1353
 
 
1354
def set_signal_handler(signum, handler, restart_syscall=True):
 
1355
    """A wrapper for signal.signal that also calls siginterrupt(signum, False)
 
1356
    on platforms that support that.
 
1357
 
 
1358
    :param restart_syscall: if set, allow syscalls interrupted by a signal to
 
1359
        automatically restart (by calling `signal.siginterrupt(signum,
 
1360
        False)`).  May be ignored if the feature is not available on this
 
1361
        platform or Python version.
 
1362
    """
 
1363
    old_handler = signal.signal(signum, handler)
 
1364
    if restart_syscall:
 
1365
        try:
 
1366
            siginterrupt = signal.siginterrupt
 
1367
        except AttributeError: # siginterrupt doesn't exist on this platform, or for this version of
 
1368
            # Python.
 
1369
            pass
 
1370
        else:
 
1371
            siginterrupt(signum, False)
 
1372
    return old_handler
 
1373
 
 
1374
 
1352
1375
default_terminal_width = 80
1353
1376
"""The default terminal width for ttys.
1354
1377
 
1456
1479
            # the current design -- vila 20091216
1457
1480
            pass
1458
1481
        else:
1459
 
            signal.signal(signal.SIGWINCH, _terminal_size_changed)
 
1482
            set_signal_handler(signal.SIGWINCH, _terminal_size_changed)
1460
1483
        _registered_sigwinch = True
1461
1484
 
1462
1485
 
1783
1806
            real_handlers[kind](abspath, relpath)
1784
1807
 
1785
1808
 
 
1809
def copy_ownership(dst, src=None):
 
1810
    """Copy usr/grp ownership from src file/dir to dst file/dir.
 
1811
 
 
1812
    If src is None, the containing directory is used as source. If chown
 
1813
    fails, the error is ignored and a warning is printed.
 
1814
    """
 
1815
    has_chown = getattr(os, 'chown')
 
1816
    if has_chown is None: return
 
1817
 
 
1818
    if src == None:
 
1819
        src = os.path.dirname(dst)
 
1820
        if src == '':
 
1821
            src = '.'
 
1822
 
 
1823
    try:
 
1824
        s = os.stat(src)
 
1825
        os.chown(dst, s.st_uid, s.st_gid)
 
1826
    except OSError, e:
 
1827
        trace.warning("Unable to copy ownership from '%s' to '%s': IOError: %s." % (src, dst, e))
 
1828
 
 
1829
 
 
1830
def mkdir_with_ownership(path, ownership_src=None):
 
1831
    """Create the directory 'path' with specified ownership.
 
1832
 
 
1833
    If ownership_src is given, copies (chown) usr/grp ownership
 
1834
    from 'ownership_src' to 'path'. If ownership_src is None, use the
 
1835
    containing dir ownership.
 
1836
    """
 
1837
    os.mkdir(path)
 
1838
    copy_ownership(path, ownership_src)
 
1839
 
 
1840
 
 
1841
def open_with_ownership(filename, mode='r', bufsize=-1, ownership_src=None):
 
1842
    """Open the file 'filename' with the specified ownership.
 
1843
 
 
1844
    If ownership_src is specified, copy usr/grp ownership from ownership_src
 
1845
    to filename. If ownership_src is None, copy ownership from containing
 
1846
    directory.
 
1847
    Returns the opened file object.
 
1848
    """
 
1849
    f = open(filename, mode, bufsize)
 
1850
    copy_ownership(filename, ownership_src)
 
1851
    return f
 
1852
 
 
1853
 
1786
1854
def path_prefix_key(path):
1787
1855
    """Generate a prefix-order path key for path.
1788
1856