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

[fix] Combine bind section regex with bind panel file

Browse source
This commit is contained in:
ljf (zamentur) 2023-08-25 22:36:33 +02:00 • committed by GitHub
parent 79e620ef42
commit dcafac1913
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
helpers/config
View file

@ -142,7 +142,16 @@ for panel_name, panel in loaded_toml.items():
bind_panel = panel.get('bind') bind_panel = panel.get('bind')
for section_name, section in panel.items(): for section_name, section in panel.items():
if not isinstance(section, dict): continue if not isinstance(section, dict): continue
bind_section = section.get('bind', bind_panel) bind_section = section.get('bind')
if not bind_section:
bind_section = bind_panel
elif bind_section[-1] == ":" and bind_panel and ":" in bind_panel:
regex, bind_panel_file = bind_panel.split(":")
if ">" in bind_section:
bind_section = bind_section + bind_panel_file
else:
bind_section = regex + bind_section + bind_panel_file
for name, param in section.items(): for name, param in section.items():
if not isinstance(param, dict): if not isinstance(param, dict):
continue continue