YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

timestamp check fix + bugfix

Browse source
This commit is contained in:
Kload 2013-06-06 12:00:30 +00:00
parent 7b8a14ca6b
commit d9f2999e17
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
yunohost_app.py
View file

@ -7,7 +7,6 @@ import shutil
import stat import stat
import yaml import yaml
import time import time
from pprint import pprint
from yunohost import YunoHostError, YunoHostLDAP, win_msg, random_password, lvl, is_true, lemon_configuration from yunohost import YunoHostError, YunoHostLDAP, win_msg, random_password, lvl, is_true, lemon_configuration
from yunohost_domain import domain_list, domain_add from yunohost_domain import domain_list, domain_add
from yunohost_user import user_info from yunohost_user import user_info
@ -261,7 +260,6 @@ def app_upgrade(app, instance=[], url=None, file=None):
unique_app_id = app_id +'__'+ number unique_app_id = app_id +'__'+ number
if unique_app_id in upgraded_apps: if unique_app_id in upgraded_apps:
raise YunoHostError(1, _("Conflict, multiple upgrades of the same app: ")+ app_id +' (instance n°'+ number +')') raise YunoHostError(1, _("Conflict, multiple upgrades of the same app: ")+ app_id +' (instance n°'+ number +')')
upgraded_apps.append(unique_app_id)
current_app_dict = app_info(app_id, instance=number, raw=True) current_app_dict = app_info(app_id, instance=number, raw=True)
new_app_dict = app_info(app_id, raw=True) new_app_dict = app_info(app_id, raw=True)
@ -270,9 +268,7 @@ def app_upgrade(app, instance=[], url=None, file=None):
manifest = _extract_app_from_file(file) manifest = _extract_app_from_file(file)
elif url: elif url:
manifest = _fetch_app_from_git(url) manifest = _fetch_app_from_git(url)
elif (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']): elif (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) or ('update_time' not in current_app_dict['settings'] 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'])):
#TODO: Timestamp sync issue
#elif (new_app_dict['lastUpdate'] > current_app_dict['lastUpdate']) or (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 = _fetch_app_from_git(app_id) manifest = _fetch_app_from_git(app_id)
else: else:
continue continue
@ -360,6 +356,7 @@ def app_upgrade(app, instance=[], url=None, file=None):
# So much win # # So much win #
######################################### #########################################
upgraded_apps.append(unique_app_id)
win_msg(app_id + _(" upgraded successfully")) win_msg(app_id + _(" upgraded successfully"))
if not upgraded_apps: if not upgraded_apps: