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

[mod] simplify condition\n\nUntestedgit add -p

Browse source
This commit is contained in:
Laurent Peuch 2016-10-11 14:51:27 +02:00
parent 37dcf50f1e
commit cfbe007123
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/yunohost/app.py
View file

@ -366,6 +366,8 @@ def app_upgrade(auth, app=[], url=None, file=None):
current_app_dict = app_info(app_instance_name, raw=True) current_app_dict = app_info(app_instance_name, raw=True)
new_app_dict = app_info(app_instance_name, raw=True) new_app_dict = app_info(app_instance_name, raw=True)
locale_update_time = current_app_dict['settings'].get('update_time', current_app_dict['settings']['install_time'])
if file: if file:
manifest, extracted_app_folder = _extract_app_from_file(file) manifest, extracted_app_folder = _extract_app_from_file(file)
elif url: elif url:
@ -373,10 +375,7 @@ def app_upgrade(auth, app=[], url=None, file=None):
elif new_app_dict is None or 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict: elif new_app_dict is None or 'lastUpdate' not in new_app_dict or 'git' not in new_app_dict:
logger.warning(m18n.n('custom_app_url_required', app=app_instance_name)) logger.warning(m18n.n('custom_app_url_required', app=app_instance_name))
continue continue
elif ('update_time' not in current_app_dict['settings'] \ elif new_app_dict['lastUpdate'] > locale_update_time:
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['install_time'])) \
or ('update_time' in current_app_dict['settings'] \
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['update_time'])):
manifest, extracted_app_folder = _fetch_app_from_git(app_instance_name) manifest, extracted_app_folder = _fetch_app_from_git(app_instance_name)
else: else:
continue continue