From 2c67d062c6c25b522264ac0e9d7eef3dc818f6c3 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 10 Jul 2017 17:45:34 +0200 Subject: [PATCH 1/2] [fix] Do not crash if archivemount is not there (#325) --- src/yunohost/backup.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/yunohost/backup.py b/src/yunohost/backup.py index 03598ec48..0934f82e9 100644 --- a/src/yunohost/backup.py +++ b/src/yunohost/backup.py @@ -1776,8 +1776,13 @@ class TarBackupMethod(BackupMethod): tar.close() # Mount the tarball - ret = subprocess.call(['archivemount', '-o', 'readonly', - self._archive_file, self.work_dir]) + try: + ret = subprocess.call(['archivemount', '-o', 'readonly', + self._archive_file, self.work_dir]) + except: + ret = -1 + + # If archivemount failed, extract the archive if ret != 0: logger.warning(m18n.n('backup_archive_mount_failed')) From 91bfd5e266cc0d037368572091a5712ac893aff8 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 26 Jul 2017 11:57:12 -0400 Subject: [PATCH 2/2] Update changelog for 2.6.5 release --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index cfedc4baf..0c99f1091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +yunohost (2.6.5) stable; urgency=low + + Minor fix + --------- + + * Do not crash backup restore if archivemount is not there (#325) + + -- Alexandre Aubin Wed, 26 Jul 2017 11:56:09 -0400 + yunohost (2.6.4) stable; urgency=low Changes