+
+from __future__ import absolute_import
import stat, os
-from bup.helpers import *
+
+from bup.helpers import add_error, should_rx_exclude_path, debug1, resolve_parent
+from bup.io import path_msg
import bup.xstat as xstat
+
try:
O_LARGEFILE = os.O_LARGEFILE
except AttributeError:
_IFMT = stat.S_IFMT(0xffffffff) # avoid function call in inner loop
def _dirlist():
l = []
- for n in os.listdir('.'):
+ for n in os.listdir(b'.'):
try:
st = xstat.lstat(n)
- except OSError, e:
- add_error(Exception('%s: %s' % (realpath(n), str(e))))
+ except OSError as e:
+ add_error(Exception('%s: %s' % (resolve_parent(n), str(e))))
continue
if (st.st_mode & _IFMT) == stat.S_IFDIR:
- n += '/'
+ n += b'/'
l.append((n,st))
l.sort(reverse=True)
return l
def _recursive_dirlist(prepend, xdev, bup_dir=None,
excluded_paths=None,
- exclude_rxs=None):
+ exclude_rxs=None,
+ xdev_exceptions=frozenset()):
for (name,pst) in _dirlist():
path = prepend + name
if excluded_paths:
if os.path.normpath(path) in excluded_paths:
- debug1('Skipping %r: excluded.\n' % path)
+ debug1('Skipping %r: excluded.\n' % path_msg(path))
continue
if exclude_rxs and should_rx_exclude_path(path, exclude_rxs):
continue
- if name.endswith('/'):
+ if name.endswith(b'/'):
if bup_dir != None:
if os.path.normpath(path) == bup_dir:
debug1('Skipping BUP_DIR.\n')
continue
- if xdev != None and pst.st_dev != xdev:
- debug1('Skipping contents of %r: different filesystem.\n' % path)
+ if xdev != None and pst.st_dev != xdev \
+ and path not in xdev_exceptions:
+ debug1('Skipping contents of %r: different filesystem.\n'
+ % path_msg(path))
else:
try:
OsFile(name).fchdir()
- except OSError, e:
+ except OSError as e:
add_error('%s: %s' % (prepend, e))
else:
for i in _recursive_dirlist(prepend=prepend+name, xdev=xdev,
bup_dir=bup_dir,
excluded_paths=excluded_paths,
- exclude_rxs=exclude_rxs):
+ exclude_rxs=exclude_rxs,
+ xdev_exceptions=xdev_exceptions):
yield i
- os.chdir('..')
+ os.chdir(b'..')
yield (path, pst)
-def recursive_dirlist(paths, xdev, bup_dir=None, excluded_paths=None,
- exclude_rxs=None):
- startdir = OsFile('.')
+def recursive_dirlist(paths, xdev, bup_dir=None,
+ excluded_paths=None,
+ exclude_rxs=None,
+ xdev_exceptions=frozenset()):
+ startdir = OsFile(b'.')
try:
assert(type(paths) != type(''))
for path in paths:
if stat.S_ISLNK(pst.st_mode):
yield (path, pst)
continue
- except OSError, e:
+ except OSError as e:
add_error('recursive_dirlist: %s' % e)
continue
try:
pfile = OsFile(path)
- except OSError, e:
+ except OSError as e:
add_error(e)
continue
pst = pfile.stat()
xdev = None
if stat.S_ISDIR(pst.st_mode):
pfile.fchdir()
- prepend = os.path.join(path, '')
+ prepend = os.path.join(path, b'')
for i in _recursive_dirlist(prepend=prepend, xdev=xdev,
bup_dir=bup_dir,
excluded_paths=excluded_paths,
- exclude_rxs=exclude_rxs):
+ exclude_rxs=exclude_rxs,
+ xdev_exceptions=xdev_exceptions):
yield i
startdir.fchdir()
else: