fuse/mount code and test fixes

borgbackup · Aug 14, 2024 · dd57cb3 · dd57cb3
1 parent 05a56dc
commit dd57cb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/borg/fuse.py b/src/borg/fuse.py
@@ -46,7 +46,7 @@ def async_wrapper(fn):
 from .item import Item
 from .platform import uid2user, gid2group
 from .platformflags import is_darwin
-from .remote import RemoteRepository  # TODO 3
+from .remote3 import RemoteRepository3
 
 
 def fuse_main():
@@ -546,7 +546,7 @@ def pop_option(options, key, present, not_present, wanted_type, int_base=0):
         self._create_filesystem()
         llfuse.init(self, mountpoint, options)
         if not foreground:
-            if isinstance(self.repository_uncached, RemoteRepository):
+            if isinstance(self.repository_uncached, RemoteRepository3):
                 daemonize()
             else:
                 with daemonizing() as (old_id, new_id):

diff --git a/src/borg/testsuite/archiver/mount_cmds.py b/src/borg/testsuite/archiver/mount_cmds.py
@@ -7,7 +7,7 @@
 
 from ... import xattr, platform
 from ...constants import *  # NOQA
-from ...locking import Lock
+from ...locking3 import Lock
 from ...helpers import flags_noatime, flags_normal
 from .. import has_lchflags, llfuse
 from .. import changedir, no_selinux, same_ts_ns