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

[enh] Skip the checkurl for the given app

Browse source
This commit is contained in:
Jérôme Lebleu 2015-10-03 05:47:35 +02:00
parent 0addfebd9c
commit 652fc79f5a
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/yunohost/app.py
View file

@ -856,6 +856,7 @@ def app_checkurl(auth, url, app=None):
domain = url[:url.index('/')] domain = url[:url.index('/')]
path = url[url.index('/'):] path = url[url.index('/'):]
installed = False
if path[-1:] != '/': if path[-1:] != '/':
path = path + '/' path = path + '/'
@ -866,14 +867,19 @@ def app_checkurl(auth, url, app=None):
raise MoulinetteError(errno.EINVAL, m18n.n('domain_unknown')) raise MoulinetteError(errno.EINVAL, m18n.n('domain_unknown'))
if domain in apps_map: if domain in apps_map:
if path in apps_map[domain]: for p, a in apps_map[domain].items():
raise MoulinetteError(errno.EINVAL, m18n.n('app_location_already_used')) # Skip requested app checking
for app_path, v in apps_map[domain].items(): if app is not None and a['id'] == app:
if app_path in path and app_path.count('/') < path.count('/'): installed = True
continue
if path == p:
raise MoulinetteError(errno.EINVAL,
m18n.n('app_location_already_used'))
elif path.startswith(p) and p.count('/') < path.count('/'):
raise MoulinetteError(errno.EPERM, raise MoulinetteError(errno.EPERM,
m18n.n('app_location_install_failed')) m18n.n('app_location_install_failed'))
if app is not None: if app is not None and not installed:
app_setting(app, 'domain', value=domain) app_setting(app, 'domain', value=domain)
app_setting(app, 'path', value=path) app_setting(app, 'path', value=path)