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

Don't raise an exception in the middle of the loop, that check can be done before

Browse source
This commit is contained in:
Alexandre Aubin 2019-02-26 02:34:02 +01:00
parent 366d8231eb
commit 15b3733e22
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/app.py
View file

@ -594,6 +594,10 @@ def app_upgrade(auth, app=[], url=None, file=None):
# Remove possible duplicates
apps = [app for i,app in enumerate(apps) if apps not in apps[:i]]
# Abort if any of those app is in fact not installed..
for app in [app for app in apps if not _is_installed(app)]:
raise YunohostError('app_not_installed', app=app)
if len(apps) == 0:
raise YunohostError('app_no_upgrade')
if len(apps) > 1:
@ -601,9 +605,6 @@ def app_upgrade(auth, app=[], url=None, file=None):
for app_instance_name in apps:
logger.info(m18n.n('app_upgrade_app_name', app=app_instance_name))
installed = _is_installed(app_instance_name)
if not installed:
raise YunohostError('app_not_installed', app=app_instance_name)
app_dict = app_info(app_instance_name, raw=True)