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

Crash early about apps already installed when attempting to restore

Browse source
This commit is contained in:
Alexandre Aubin 2020-05-18 18:49:15 +02:00
parent 94ea826518
commit f9e4c96ca3
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.json
View file

@ -534,6 +534,7 @@
"regenconf_failed": "Could not regenerate the configuration for category(s): {categories}", "regenconf_failed": "Could not regenerate the configuration for category(s): {categories}",
"regenconf_pending_applying": "Applying pending configuration for category '{category}'…", "regenconf_pending_applying": "Applying pending configuration for category '{category}'…",
"restore_already_installed_app": "An app with the ID '{app:s}' is already installed", "restore_already_installed_app": "An app with the ID '{app:s}' is already installed",
"restore_already_installed_apps": "The following apps can't be restored because they are already installed: {apps}",
"restore_app_failed": "Could not restore the app '{app:s}'", "restore_app_failed": "Could not restore the app '{app:s}'",
"restore_cleaning_failed": "Could not clean up the temporary restoration directory", "restore_cleaning_failed": "Could not clean up the temporary restoration directory",
"restore_complete": "Restored", "restore_complete": "Restored",

32
src/yunohost/backup.py
View file

@ -1004,10 +1004,20 @@ class RestoreManager():
logger.error(m18n.n('backup_archive_app_not_found', logger.error(m18n.n('backup_archive_app_not_found',
app=app)) app=app))
self.targets.set_wanted("apps", to_be_restored = self.targets.set_wanted("apps",
apps, apps,
self.info['apps'].keys(), self.info['apps'].keys(),
unknown_error) unknown_error)
# If all apps to restore are already installed, stop right here.
# Otherwise, if at least one app can be restored, we keep going on
# because those which can be restored will indeed be restored
already_installed = [app for app in to_be_restored if _is_installed(app)]
if already_installed != []:
if already_installed == to_be_restored:
raise YunohostError("restore_already_installed_apps", apps=', '.join(already_installed))
else:
logger.warning(m18n.n("restore_already_installed_apps", apps=', '.join(already_installed)))
# #
# Archive mounting # # Archive mounting #
@ -1301,13 +1311,6 @@ class RestoreManager():
else: else:
shutil.copy2(s, d) shutil.copy2(s, d)
# Start register change on system
related_to = [('app', app_instance_name)]
operation_logger = OperationLogger('backup_restore_app', related_to)
operation_logger.start()
logger.info(m18n.n("app_start_restore", app=app_instance_name))
# Check if the app is not already installed # Check if the app is not already installed
if _is_installed(app_instance_name): if _is_installed(app_instance_name):
logger.error(m18n.n('restore_already_installed_app', logger.error(m18n.n('restore_already_installed_app',
@ -1315,6 +1318,13 @@ class RestoreManager():
self.targets.set_result("apps", app_instance_name, "Error") self.targets.set_result("apps", app_instance_name, "Error")
return return
# Start register change on system
related_to = [('app', app_instance_name)]
operation_logger = OperationLogger('backup_restore_app', related_to)
operation_logger.start()
logger.info(m18n.n("app_start_restore", app=app_instance_name))
app_dir_in_archive = os.path.join(self.work_dir, 'apps', app_instance_name) app_dir_in_archive = os.path.join(self.work_dir, 'apps', app_instance_name)
app_backup_in_archive = os.path.join(app_dir_in_archive, 'backup') app_backup_in_archive = os.path.join(app_dir_in_archive, 'backup')
app_settings_in_archive = os.path.join(app_dir_in_archive, 'settings') app_settings_in_archive = os.path.join(app_dir_in_archive, 'settings')

7
src/yunohost/tests/test_backuprestore.py
View file

@ -475,10 +475,9 @@ def test_restore_app_already_installed(mocker):
assert _is_installed("wordpress") assert _is_installed("wordpress")
with message(mocker, 'restore_already_installed_app', app="wordpress"): with message(mocker, 'restore_already_installed_apps', apps="wordpress"):
with raiseYunohostError(mocker, 'restore_nothings_done'): backup_restore(system=None, name=backup_list()["archives"][0],
backup_restore(system=None, name=backup_list()["archives"][0], apps=["wordpress"])
apps=["wordpress"])
assert _is_installed("wordpress") assert _is_installed("wordpress")