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

Change min_version check and remove temp file

Browse source
This commit is contained in:
Jerome Lebleu 2013-12-19 17:31:29 +01:00
parent a4acb4ee69
commit f2a1b35bfb
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
yunohost_app.py
View file

@ -82,6 +82,7 @@ def app_fetchlist(url=None, name=None):
list_file = repo_path +'/'+ name +'.json' list_file = repo_path +'/'+ name +'.json'
if os.system('wget "'+ url +'" -O "'+ list_file +'.tmp"') != 0: if os.system('wget "'+ url +'" -O "'+ list_file +'.tmp"') != 0:
os.remove(list_file +'.tmp')
raise YunoHostError(1, _("List server connection failed")) raise YunoHostError(1, _("List server connection failed"))
# Rename fetched temp list # Rename fetched temp list
@ -312,7 +313,7 @@ def app_upgrade(app, url=None, file=None):
# Check min version # Check min version
if 'min_version' in manifest and __version__ < manifest['min_version']: if 'min_version' in manifest and __version__ < manifest['min_version']:
raise YunoHostError(1, app_id + _(" requires a more recent version of the moulinette")) raise YunoHostError(1, _("%s requires a more recent version of the moulinette") % app_id)
app_setting_path = apps_setting_path +'/'+ app_id app_setting_path = apps_setting_path +'/'+ app_id
@ -388,16 +389,16 @@ def app_install(app, label=None, args=None):
else: else:
manifest = _extract_app_from_file(app) manifest = _extract_app_from_file(app)
# Check min version
if 'min_version' in manifest and __version__ < manifest['min_version']:
raise YunoHostError(1, _("App requires a more recent version of the moulinette"))
# Check ID # Check ID
if 'id' not in manifest or '__' in manifest['id']: if 'id' not in manifest or '__' in manifest['id']:
raise YunoHostError(22, _("App id is invalid")) raise YunoHostError(22, _("App id is invalid"))
app_id = manifest['id'] app_id = manifest['id']
# Check min version
if 'min_version' in manifest and __version__ < manifest['min_version']:
raise YunoHostError(1, _("%s requires a more recent version of the moulinette") % app_id)
# Check if app can be forked # Check if app can be forked
instance_number = _installed_instance_number(app_id, last=True) + 1 instance_number = _installed_instance_number(app_id, last=True) + 1
if instance_number > 1 : if instance_number > 1 :