mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-01-01 04:37:34 +00:00
Code Issues Releases Wiki Activity

don't do stat() when not recursing into excluded dir, fixes #3209

Browse source 
also: fix exception handling for the stat() calls

just moving all these lines into the "try"-block below (like it was in 1.0).

(cherry picked from commit 0c410e84fe)
This commit is contained in:
Thomas Waldmann 2017-10-24 01:25:53 +02:00
parent 7060fd23ec
commit 338f56b97d
1 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/borg/archiver.py
View file

@ -555,20 +555,27 @@ def _process(self, archive, cache, matcher, exclude_caches, exclude_if_present,
This should only raise on critical errors. Per-item errors must be handled within this method.
"""
if st is None:
with backup_io('stat'):
st = os.stat(path, follow_symlinks=False)
recurse_excluded_dir = False
if not matcher.match(path):
self.print_file_status('x', path)
if stat.S_ISDIR(st.st_mode) and matcher.recurse_dir:
recurse_excluded_dir = True
else:
return
try:
recurse_excluded_dir = False
if matcher.match(path):
if st is None:
with backup_io('stat'):
st = os.stat(path, follow_symlinks=False)
else:
self.print_file_status('x', path)
# get out here as quickly as possible:
# we only need to continue if we shall recurse into an excluded directory.
# if we shall not recurse, then do not even touch (stat()) the item, it
# could trigger an error, e.g. if access is forbidden, see #3209.
if not matcher.recurse_dir:
return
if st is None:
with backup_io('stat'):
st = os.stat(path, follow_symlinks=False)
recurse_excluded_dir = stat.S_ISDIR(st.st_mode)
if not recurse_excluded_dir:
return
if (st.st_ino, st.st_dev) in skip_inodes:
return
# if restrict_dev is given, we do not want to recurse into a new filesystem,