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

Check if the upgrade got manually interrupted, c.f. same stuff in app_install

Browse source
This commit is contained in:
Alexandre Aubin 2019-09-16 00:13:41 +02:00
parent c530325e29
commit 875c570c6d
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.json
View file

@ -409,6 +409,7 @@
"no_ipv6_connectivity": "IPv6 connectivity is not available", "no_ipv6_connectivity": "IPv6 connectivity is not available",
"no_restore_script": "No restore script found for the app '{app:s}'", "no_restore_script": "No restore script found for the app '{app:s}'",
"not_enough_disk_space": "Not enough free disk space on '{path:s}'", "not_enough_disk_space": "Not enough free disk space on '{path:s}'",
"operation_interrupted": "The operation was manually interrupted?",
"package_not_installed": "Package '{pkgname}' is not installed", "package_not_installed": "Package '{pkgname}' is not installed",
"package_unexpected_error": "An unexpected error occurred processing the package '{pkgname}'", "package_unexpected_error": "An unexpected error occurred processing the package '{pkgname}'",
"package_unknown": "Unknown package '{pkgname}'", "package_unknown": "Unknown package '{pkgname}'",

5
src/yunohost/app.py
View file

@ -679,7 +679,10 @@ def app_upgrade(app=[], url=None, file=None):
finally: finally:
# Did the script succeed ? # Did the script succeed ?
if upgrade_retcode != 0: if upgrade_retcode == -1:
error_msg = m18n.n('operation_interrupted')
operation_logger.error(error_msg)
elif upgrade_retcode != 0:
error_msg = m18n.n('app_upgrade_failed', app=app_instance_name) error_msg = m18n.n('app_upgrade_failed', app=app_instance_name)
operation_logger.error(error_msg) operation_logger.error(error_msg)