Skip to content

conftest: fix rmtree cleanup crash on Linux (os.lchflags does not exist) #10124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ThomasWaldmann merged 1 commit into from
Aug 16, 2026
+4 −1
Merged

conftest: fix rmtree cleanup crash on Linux (os.lchflags does not exist) #10124

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion src/borg/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
setup_logging()

from borg.archiver import Archiver # noqa: E402
from borg.platform import set_flags # noqa: E402
from borg.testsuite import has_lchflags, has_llfuse, has_pyfuse3, has_mfusepy # noqa: E402
from borg.testsuite import are_symlinks_supported, are_hardlinks_supported, is_utime_fully_supported # noqa: E402
from borg.testsuite.archiver import BORG_EXES
Expand Down Expand Up @@ -196,8 +197,10 @@ def archiver(tmp_path, set_env_variables):
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.
# Note: use borg's cross-platform set_flags, not os.lchflags - the latter does not exist
# on Linux even though has_lchflags is True there (Linux clears flags via ioctl).
try:
os.lchflags(path, 0)
set_flags(path, 0)
func(path)
except OSError:
pass
Expand Down
Loading