[mod] current_app_dict == new_app_dict so test is always false

This commit is contained in:
Laurent Peuch 2016-10-11 14:49:44 +02:00
parent 2c0c53d06f
commit 37dcf50f1e

View file

@ -373,8 +373,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 (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) \ elif ('update_time' not in current_app_dict['settings'] \
or ('update_time' not in current_app_dict['settings'] \
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['install_time'])) \ and (new_app_dict['lastUpdate'] > current_app_dict['settings']['install_time'])) \
or ('update_time' in current_app_dict['settings'] \ or ('update_time' in current_app_dict['settings'] \
and (new_app_dict['lastUpdate'] > current_app_dict['settings']['update_time'])): and (new_app_dict['lastUpdate'] > current_app_dict['settings']['update_time'])):