Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/borg/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,21 @@ def archiver(tmp_path, set_env_variables):
os.chdir(archiver.tmpdir)
yield archiver
os.chdir(old_wd)
shutil.rmtree(archiver.tmpdir, ignore_errors=True) # clean up

def maybe_clear_flags_and_retry(func, path, _exc_info):
if has_lchflags:
# Clear any BSD flags (e.g. UF_APPEND) that may have prevented removal, then retry once.
try:
os.lchflags(path, 0)
func(path)
except OSError:
pass
else:
# Do nothing (equivalent to `ignore_errors=True`) if flags aren't supported on this platform.
pass

# Clean up archiver temp files
shutil.rmtree(archiver.tmpdir, onerror=maybe_clear_flags_and_retry)


@pytest.fixture()
Expand Down
Loading