From fa9cef7abfaf97bb325d338c2b9d392620440fc8 Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Mon, 22 May 2017 13:29:38 +0200 Subject: [PATCH] mount: do pre-mount checks before opening repository --- borg/archiver.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/borg/archiver.py b/borg/archiver.py index 8ffc0d3de..9aa8bde06 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -559,22 +559,24 @@ class Archiver: def do_mount(self, args): """Mount archive or an entire repository as a FUSE filesystem""" + # Perform these checks before opening the repository and asking for a passphrase. + try: import borg.fuse except ImportError as e: self.print_error('borg mount not available: loading fuse support failed [ImportError: %s]' % str(e)) return self.exit_code + 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 + 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 - with cache_if_remote(repository) as cached_repo: if args.location.archive: archive = Archive(repository, key, manifest, args.location.archive)