Replace lresolve with resolve(..., follow=False)

[bup.git] / cmd / fuse-cmd.py

diff --git a/cmd/fuse-cmd.py b/cmd/fuse-cmd.py
index 14ae50815e9088af81925412b70a5dd8c0cd32e2..8e57ab6f937dab330f4f7fd6e5c4618e1812dfe6 100755 (executable)
--- a/cmd/fuse-cmd.py
+++ b/cmd/fuse-cmd.py
@@ -5,6 +5,7 @@ exec "$bup_python" "$0" ${1+"$@"}
 """
 # end of bup preamble
 
+from __future__ import absolute_import
 import sys, os, errno
 
 try:
@@ -13,10 +14,10 @@ except ImportError:
     log('error: cannot find the python "fuse" module; please install it\n')
     sys.exit(1)
 if not hasattr(fuse, '__version__'):
-    raise RuntimeError, "your fuse module is too old for fuse.__version__"
+    raise RuntimeError('your fuse module is too old for fuse.__version__')
 fuse.fuse_python_api = (0, 2)
 
-from bup import options, git, vfs2 as vfs, xstat
+from bup import options, git, vfs, xstat
 from bup.helpers import log
 from bup.repo import LocalRepo
 
@@ -33,8 +34,8 @@ class BupFs(fuse.Fuse):
         global opt
         if self.verbose > 0:
             log('--getattr(%r)\n' % path)
-        res = vfs.lresolve(self.repo, path, want_meta=(not self.fake_metadata))
-        log('res: %r\n' % (res,))
+        res = vfs.resolve(self.repo, path, want_meta=(not self.fake_metadata),
+                          follow=False)
         name, item = res[-1]
         if not item:
             return -errno.ENOENT
@@ -56,7 +57,7 @@ class BupFs(fuse.Fuse):
 
     def readdir(self, path, offset):
         assert not offset  # We don't return offsets, so offset should be unused
-        res = vfs.lresolve(self.repo, path)
+        res = vfs.resolve(self.repo, path, follow=False)
         dir_name, dir_item = res[-1]
         if not dir_item:
             yield -errno.ENOENT
@@ -68,7 +69,7 @@ class BupFs(fuse.Fuse):
     def readlink(self, path):
         if self.verbose > 0:
             log('--readlink(%r)\n' % path)
-        res = vfs.lresolve(self.repo, path)
+        res = vfs.resolve(self.repo, path, follow=False)
         name, item = res[-1]
         if not item:
             return -errno.ENOENT
@@ -77,7 +78,7 @@ class BupFs(fuse.Fuse):
     def open(self, path, flags):
         if self.verbose > 0:
             log('--open(%r)\n' % path)
-        res = vfs.lresolve(self.repo, path)
+        res = vfs.resolve(self.repo, path, follow=False)
         name, item = res[-1]
         if not item:
             return -errno.ENOENT
@@ -91,7 +92,7 @@ class BupFs(fuse.Fuse):
     def read(self, path, size, offset):
         if self.verbose > 0:
             log('--read(%r)\n' % path)
-        res = vfs.lresolve(self.repo, path)
+        res = vfs.resolve(self.repo, path, follow=False)
         name, item = res[-1]
         if not item:
             return -errno.ENOENT