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] Do not raise if one app upgrade fails and regen SSOwat conf

Browse source
This commit is contained in:
Jérôme Lebleu 2016-02-26 20:18:22 +01:00
parent fdc7d2e8c5
commit 565bc616d8
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -22,7 +22,7 @@
"custom_app_url_required" : "You must provide an URL to upgrade your custom app {:s}",
"app_recent_version_required" : "{app:s} requires a more recent version of YunoHost",
"app_upgraded" : "{app:s} successfully upgraded",
"app_upgrade_failed" : "Unable to upgrade all apps",
"app_upgrade_failed" : "Unable to upgrade {app:s}",
"app_id_invalid" : "Invalid app id",
"app_already_installed" : "{:s} is already installed",
"app_removed" : "{app:s} successfully removed",

4
src/yunohost/app.py
View file

@ -381,7 +381,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
# Execute App upgrade script
os.system('chown -hR admin: %s' % install_tmp)
if hook_exec(app_tmp_folder +'/scripts/upgrade', args_list) != 0:
raise MoulinetteError(errno.EIO, m18n.n('installation_failed'))
logger.error(m18n.n('app_upgrade_failed', app=app_id))
else:
now = int(time.time())
# TODO: Move install_time away from app_setting
@ -403,6 +403,8 @@ def app_upgrade(auth, app=[], url=None, file=None):
if not upgraded_apps:
raise MoulinetteError(errno.ENODATA, m18n.n('app_no_upgrade'))
app_ssowatconf(auth)
msignals.display(m18n.n('upgrade_complete'), 'success')