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

Properly handle the sanity checks right after upgrades (in combination with managing the regular error code...). This is similar to what's done for app_install

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-15 02:22:29 +02:00
parent 08ecace5ec
commit c530325e29
1 changed files with 66 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/yunohost/app.py
View file

@ -666,10 +666,34 @@ def app_upgrade(app=[], url=None, file=None):
# Execute App upgrade script # Execute App upgrade script
os.system('chown -hR admin: %s' % INSTALL_TMP) os.system('chown -hR admin: %s' % INSTALL_TMP)
if hook_exec(extracted_app_folder + '/scripts/upgrade',
args=args_list, env=env_dict)[0] != 0:
msg = m18n.n('app_upgrade_failed', app=app_instance_name) try:
operation_logger.error(msg) upgrade_retcode = hook_exec(extracted_app_folder + '/scripts/upgrade',
args=args_list, env=env_dict)[0]
except (KeyboardInterrupt, EOFError):
upgrade_retcode = -1
except Exception:
import traceback
logger.exception(m18n.n('unexpected_error', error=u"\n" + traceback.format_exc()))
finally:
# Did the script succeed ?
if upgrade_retcode != 0:
error_msg = m18n.n('app_upgrade_failed', app=app_instance_name)
operation_logger.error(error_msg)
# Did it broke the system ?
try:
broke_the_system = False
_assert_system_is_sane_for_app(manifest, "post")
except Exception as e:
broke_the_system = True
error_msg = operation_logger.error(str(e))
# If upgrade failed or broke the system,
# raise an error and interrupt all other pending upgrades
if upgrade_retcode != 0 or broke_the_system:
# display this if there are remaining apps # display this if there are remaining apps
if apps[number + 1:]: if apps[number + 1:]:
@ -681,7 +705,9 @@ def app_upgrade(app=[], url=None, file=None):
failed_app=app_instance_name, failed_app=app_instance_name,
apps=', '.join(not_upgraded_apps)) apps=', '.join(not_upgraded_apps))
else: else:
raise YunohostError(msg) raise YunohostError(error_msg, raw_msg=True)
# Otherwise we're good and keep going !
else: else:
now = int(time.time()) now = int(time.time())
# TODO: Move install_time away from app_setting # TODO: Move install_time away from app_setting
@ -713,7 +739,6 @@ def app_upgrade(app=[], url=None, file=None):
# So much win # So much win
logger.success(m18n.n('app_upgraded', app=app_instance_name)) logger.success(m18n.n('app_upgraded', app=app_instance_name))
_assert_system_is_sane_for_app(manifest, "post")
hook_callback('post_app_upgrade', args=args_list, env=env_dict) hook_callback('post_app_upgrade', args=args_list, env=env_dict)
operation_logger.success() operation_logger.success()