YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Do not crash if archivemount is not there (#325)

Browse source
This commit is contained in:
Alexandre Aubin 2017-07-10 17:45:34 +02:00 • committed by GitHub
parent 9bbdaac58b
commit f0c9e697fe
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/yunohost/backup.py
View file

@ -1776,8 +1776,13 @@ class TarBackupMethod(BackupMethod):
tar.close() tar.close()
# Mount the tarball # Mount the tarball
ret = subprocess.call(['archivemount', '-o', 'readonly', try:
self._archive_file, self.work_dir]) ret = subprocess.call(['archivemount', '-o', 'readonly',
self._archive_file, self.work_dir])
except:
ret = -1
# If archivemount failed, extract the archive
if ret != 0: if ret != 0:
logger.warning(m18n.n('backup_archive_mount_failed')) logger.warning(m18n.n('backup_archive_mount_failed'))