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] Remove the app if it restoration failed

Browse source
This commit is contained in:
Jérôme Lebleu 2016-05-06 20:16:49 +02:00
parent 4c9b79f5fc
commit 26aa1cba37
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/yunohost/backup.py
View file

@ -475,6 +475,10 @@ def backup_restore(auth, name, hooks=[], ignore_hooks=False,
tmp_app_dir = '{:s}/apps/{:s}'.format(tmp_dir, app_instance_name) tmp_app_dir = '{:s}/apps/{:s}'.format(tmp_dir, app_instance_name)
tmp_app_bkp_dir = tmp_app_dir + '/backup' tmp_app_bkp_dir = tmp_app_dir + '/backup'
# Parse app instance name and id
# TODO: Use app_id to check if app is installed?
app_id, app_instance_nb = _parse_app_instance_name(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',
@ -492,6 +496,7 @@ def backup_restore(auth, name, hooks=[], ignore_hooks=False,
logger.info(m18n.n('restore_running_app_script', app=app_instance_name)) logger.info(m18n.n('restore_running_app_script', app=app_instance_name))
try: try:
# Copy app settings and set permissions # Copy app settings and set permissions
# TODO: Copy app hooks too
shutil.copytree(tmp_app_dir + '/settings', app_setting_path) shutil.copytree(tmp_app_dir + '/settings', app_setting_path)
filesystem.chmod(app_setting_path, 0555, 0444, True) filesystem.chmod(app_setting_path, 0555, 0444, True)
filesystem.chmod(app_setting_path + '/settings.yml', 0400) filesystem.chmod(app_setting_path + '/settings.yml', 0400)
@ -501,7 +506,6 @@ def backup_restore(auth, name, hooks=[], ignore_hooks=False,
# Prepare env. var. to pass to script # Prepare env. var. to pass to script
env_dict = {} env_dict = {}
app_id, app_instance_nb = _parse_app_instance_name(app_instance_name)
env_dict["YNH_APP_ID"] = app_id env_dict["YNH_APP_ID"] = app_id
env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name env_dict["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb) env_dict["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
@ -511,6 +515,21 @@ def backup_restore(auth, name, hooks=[], ignore_hooks=False,
raise_on_error=True, chdir=tmp_app_bkp_dir, env=env_dict) raise_on_error=True, chdir=tmp_app_bkp_dir, env=env_dict)
except: except:
logger.exception(m18n.n('restore_app_failed', app=app_instance_name)) logger.exception(m18n.n('restore_app_failed', app=app_instance_name))
# Setup environment for remove script
env_dict_remove = {}
env_dict_remove["YNH_APP_ID"] = app_id
env_dict_remove["YNH_APP_INSTANCE_NAME"] = app_instance_name
env_dict_remove["YNH_APP_INSTANCE_NUMBER"] = str(app_instance_nb)
# Execute remove script
remove_retcode = hook_exec(
os.path.join(tmp_app_dir, 'settings/scripts/remove'),
args=[app_instance_name], env=env_dict_remove)
if remove_retcode != 0:
logger.warning(m18n.n('app_not_properly_removed',
app=app_instance_name))
# Cleaning app directory # Cleaning app directory
shutil.rmtree(app_setting_path, ignore_errors=True) shutil.rmtree(app_setting_path, ignore_errors=True)
else: else: