mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2549 from enkore/issue/2541 

mount: do pre-mount checks before opening repository
This commit is contained in:
enkore 2017-05-22 13:44:26 +02:00 committed by GitHub
parent 95f1c0a8ee 869ab1a47b
commit 3721a8a3be
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/borg/archiver.py
View File

@ -1231,22 +1231,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:
operations = FuseOperations(key, repository, manifest, args, cached_repo)
logger.info("Mounting filesystem")