From 565bc616d87b3f5444d2a3dd8169fb314f6cd55f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Fri, 26 Feb 2016 20:18:22 +0100 Subject: [PATCH] [fix] Do not raise if one app upgrade fails and regen SSOwat conf --- locales/en.json | 2 +- src/yunohost/app.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/locales/en.json b/locales/en.json index 7b0f6445e..187596dd5 100644 --- a/locales/en.json +++ b/locales/en.json @@ -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", diff --git a/src/yunohost/app.py b/src/yunohost/app.py index 5e6a0ce08..c0c4ef1eb 100644 --- a/src/yunohost/app.py +++ b/src/yunohost/app.py @@ -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')