Skip to content

Fix b20 #9240

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 2 commits into from
Dec 24, 2025
Merged

Fix b20 #9240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e671234
fix mismatch in xattr test, fixes #9238
ThomasWaldmann Dec 24, 2025
ed6e5db
remove mfusepym dependency from pyproject.toml, fixes #9239
ThomasWaldmann Dec 24, 2025
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
3 changes: 2 additions & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ dependencies = [
llfuse = ["llfuse >= 1.3.8"] # fuse 2, low-level
pyfuse3 = ["pyfuse3 >= 3.1.1"] # fuse 3, low-level, async
mfusepy = ["mfusepy >= 3.1.0, <4.0.0"] # fuse 2+3, high-level
mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"]
# a pypi release of borgbackup can't contain a dependency on github!
# mfusepym = ["mfusepy @ git+https://github.com/mxmlnkn/mfusepy.git@master"]
nofuse = []
s3 = ["borgstore[s3] ~= 0.3.0"]
sftp = ["borgstore[sftp] ~= 0.3.0"]
Expand Down
6 changes: 3 additions & 3 deletions src/borg/testsuite/archiver/extract_cmd_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,19 +565,19 @@ def patched_setxattr_EACCES(*args, **kwargs):
with patch.object(xattr, "setxattr", patched_setxattr_E2BIG):
out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
assert "too big for this filesystem" in out
assert "when setting extended attribute user.attribute" in out
assert "When setting extended attribute user.attribute" in out
os.remove(input_abspath)

with patch.object(xattr, "setxattr", patched_setxattr_ENOTSUP):
out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
assert "ENOTSUP" in out
assert "when setting extended attribute user.attribute" in out
assert "When setting extended attribute user.attribute" in out
os.remove(input_abspath)

with patch.object(xattr, "setxattr", patched_setxattr_EACCES):
out = cmd(archiver, "extract", "test", exit_code=EXIT_WARNING)
assert "EACCES" in out
assert "when setting extended attribute user.attribute" in out
assert "When setting extended attribute user.attribute" in out
assert os.path.isfile(input_abspath)


Expand Down
Loading