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

Handle case where we can't find the info.json for some reason ...

Browse source
This commit is contained in:
Alexandre Aubin 2019-07-27 01:12:41 +02:00
parent 5c02dec59c
commit e9e857c325
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/yunohost/backup.py
View file

@ -1928,6 +1928,9 @@ class TarBackupMethod(BackupMethod):
logger.debug("cannot open backup archive '%s'", logger.debug("cannot open backup archive '%s'",
self._archive_file, exc_info=1) self._archive_file, exc_info=1)
raise YunohostError('backup_archive_open_failed') raise YunohostError('backup_archive_open_failed')
# FIXME : Is this really useful to close the archive just to
# reopen it right after this with the same options ...?
tar.close() tar.close()
# Mount the tarball # Mount the tarball
@ -1940,6 +1943,11 @@ class TarBackupMethod(BackupMethod):
elif "./info.json" in tar.getnames(): elif "./info.json" in tar.getnames():
leading_dot = "./" leading_dot = "./"
tar.extract('./info.json', path=self.work_dir) tar.extract('./info.json', path=self.work_dir)
else:
logger.debug("unable to retrieve 'info.json' inside the archive",
exc_info=1)
tar.close()
raise YunohostError('backup_invalid_archive')
if "backup.csv" in tar.getnames(): if "backup.csv" in tar.getnames():
tar.extract('backup.csv', path=self.work_dir) tar.extract('backup.csv', path=self.work_dir)
@ -1984,6 +1992,8 @@ class TarBackupMethod(BackupMethod):
] ]
tar.extractall(members=subdir_and_files, path=self.work_dir) tar.extractall(members=subdir_and_files, path=self.work_dir)
# FIXME : Don't we want to close the tar archive here or at some point ?
class BorgBackupMethod(BackupMethod): class BorgBackupMethod(BackupMethod):