From e6712349426ff55e30c9689d51d0480823e51789 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 24 Dec 2025 02:17:07 +0100 Subject: [PATCH 1/2] fix mismatch in xattr test, fixes #9238 --- src/borg/testsuite/archiver/extract_cmd_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/borg/testsuite/archiver/extract_cmd_test.py b/src/borg/testsuite/archiver/extract_cmd_test.py index d9e2e8a00c..5326d2e6d0 100644 --- a/src/borg/testsuite/archiver/extract_cmd_test.py +++ b/src/borg/testsuite/archiver/extract_cmd_test.py @@ -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) From ed6e5db16896ffc617b5b2b6f6f9264032cd07e9 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Wed, 24 Dec 2025 02:19:07 +0100 Subject: [PATCH 2/2] remove mfusepym dependency from pyproject.toml, fixes #9239 --- pyproject.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index b12333239d..7d8f608bc5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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"]