From e689d8f2f66799664149f24ae9f3a20b88acb36b Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sun, 21 May 2017 11:24:09 +0200 Subject: [PATCH] mount: check llfuse is installed before asking for passphrase --- src/borg/archiver.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/borg/archiver.py b/src/borg/archiver.py index 35cf71447..79f89e972 100644 --- a/src/borg/archiver.py +++ b/src/borg/archiver.py @@ -1229,15 +1229,20 @@ class Archiver: logger.info("Cache deleted.") return self.exit_code - @with_repository() - def do_mount(self, args, repository, manifest, key): + def do_mount(self, args): """Mount archive or an entire repository as a FUSE filesystem""" try: - from .fuse import FuseOperations + import borg.fuse except ImportError as e: - self.print_error('Loading fuse support failed [ImportError: %s]' % str(e)) + self.print_error('borg mount not available: loading fuse support failed [ImportError: %s]' % str(e)) return self.exit_code + return self._do_mount(args) + + @with_repository() + def _do_mount(self, args, repository, manifest, key): + from .fuse import FuseOperations + if not os.path.isdir(args.mountpoint) or not os.access(args.mountpoint, os.R_OK | os.W_OK | os.X_OK): self.print_error('%s: Mountpoint must be a writable directory' % args.mountpoint) return self.exit_code