upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-11 01:41:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

create: add exception handler for NODUMP excluded dirs, fixes #9032

Browse source
This commit is contained in:
Thomas Waldmann 2025-09-30 18:20:32 +02:00
parent b27dba670c
commit b2798ecd3a
No known key found for this signature in database
GPG key ID: 243ACFA951F78E01
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/borg/archiver/create_cmd.py
View file

@ -510,7 +510,13 @@ class CreateMixIn:
return
if not recurse_excluded_dir:
if not dry_run:
status = fso.process_dir_with_fd(path=path, fd=child_fd, st=st, strip_prefix=strip_prefix)
try:
status = fso.process_dir_with_fd(
path=path, fd=child_fd, st=st, strip_prefix=strip_prefix
)
except BackupItemExcluded:
status = "-" # excluded (dir)
recurse = False
else:
status = "+" # included (dir)
if recurse:

11
src/borg/testsuite/archiver/create_cmd_test.py
View file

@ -1073,14 +1073,9 @@ def test_exclude_nodump_dir_with_file(archivers, request):
if not has_lchflags:
pytest.skip("platform does not support setting UF_NODUMP")
# Prepare input tree: input/nd (NODUMP) containing a file.
ndir = os.path.join(archiver.input_path, "nd")
os.mkdir(ndir)
with open(os.path.join(ndir, "file_in_ndir"), "wb") as f:
f.write(b"hello")
# Set NODUMP flag on the directory (Linux: chattr +d, BSD: chflags nodump)
platform.set_flags(ndir, stat.UF_NODUMP)
# Prepare input tree: input/nd directory (NODUMP) containing a file.
create_regular_file(archiver.input_path, "nd/file_in_ndir", contents=b"hello")
platform.set_flags(os.path.join(archiver.input_path, "nd"), stat.UF_NODUMP)
# Create repo and archive
cmd(archiver, "repo-create", RK_ENCRYPTION)