mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Revert "[fix] Can't restore app on a root domain"
This commit is contained in:
parent
a8a682ac7e
commit
7717c58de4
1 changed files with 5 additions and 1 deletions
|
@ -917,6 +917,10 @@ def app_checkurl(auth, url, app=None):
|
|||
raise MoulinetteError(errno.EINVAL, m18n.n('domain_unknown'))
|
||||
|
||||
if domain in apps_map:
|
||||
# Domain already has apps on sub path
|
||||
if path == '/':
|
||||
raise MoulinetteError(errno.EPERM,
|
||||
m18n.n('app_location_install_failed'))
|
||||
# Loop through apps
|
||||
for p, a in apps_map[domain].items():
|
||||
# Skip requested app checking
|
||||
|
@ -926,7 +930,7 @@ def app_checkurl(auth, url, app=None):
|
|||
if path == p:
|
||||
raise MoulinetteError(errno.EINVAL,
|
||||
m18n.n('app_location_already_used'))
|
||||
elif path.startswith(p) or p.startswith(path):
|
||||
elif path.startswith(p):
|
||||
raise MoulinetteError(errno.EPERM,
|
||||
m18n.n('app_location_install_failed'))
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue