mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Allow apps to be installed on a path sharing a common base, eg /foo and /foo2 (#1537)
This commit is contained in:
parent
70a8225b1d
commit
ae5941116d
1 changed files with 1 additions and 5 deletions
|
@ -2508,11 +2508,7 @@ def _get_conflicting_apps(domain, path, ignore_app=None):
|
|||
for p, a in apps_map[domain].items():
|
||||
if a["id"] == ignore_app:
|
||||
continue
|
||||
if path == p:
|
||||
conflicts.append((p, a["id"], a["label"]))
|
||||
# We also don't want conflicts with other apps starting with
|
||||
# same name
|
||||
elif path.startswith(p) or p.startswith(path):
|
||||
if path == p or path == "/" or p == "/":
|
||||
conflicts.append((p, a["id"], a["label"]))
|
||||
|
||||
return conflicts
|
||||
|
|
Loading…
Add table
Reference in a new issue