mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-22 06:01:54 +00:00
Code Issues Releases Wiki Activity

Merge pull request #6377 from ThomasWaldmann/fix-6374-master

Browse source 
create: skip with warning if opening the parent dir of recursion root fails, fixes #6374
This commit is contained in:
TW 2022-03-05 14:18:57 +01:00 committed by GitHub
commit 47a9e4686b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/borg/archiver.py
View file

@ -590,6 +590,7 @@ def create_inner(archive, cache, fso):
path = os.path.normpath(path)
parent_dir = os.path.dirname(path) or '.'
name = os.path.basename(path)
try:
# note: for path == '/': name == '' and parent_dir == '/'.
# the empty name will trigger a fall-back to path-based processing in os_stat and os_open.
with OsOpen(path=parent_dir, flags=flags_root, noatime=True, op='open_root') as parent_fd:
@ -610,6 +611,10 @@ def create_inner(archive, cache, fso):
# if we get back here, we've finished recursing into <path>,
# we do not ever want to get back in there (even if path is given twice as recursion root)
skip_inodes.add((st.st_ino, st.st_dev))
except (BackupOSError, BackupError) as e:
# this comes from OsOpen, self._rec_walk has own exception handler
self.print_warning('%s: %s', path, e)
continue
if not dry_run:
if args.progress:
archive.stats.show_progress(final=True)