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 new _load_domain_settings bug

Browse source
This commit is contained in:
Paco 2021-06-19 03:01:28 +02:00
parent ab86d13b1e
commit 22c9edb7d7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/yunohost/domain.py
View file

@ -729,20 +729,20 @@ def _get_DKIM(domain):
) )
def _load_domain_settings(for_domains=[]): def _load_domain_settings(domains=[]):
""" """
Retrieve entries in /etc/yunohost/domains/[domain].yml Retrieve entries in /etc/yunohost/domains/[domain].yml
And fill the holes if any And fill the holes if any
""" """
# Retrieve actual domain list # Retrieve actual domain list
get_domain_list = domain_list() get_domain_list = domain_list()
domains = []
if for_domains: if domains:
# keep only the requested domains # check existence of requested domains
domains = filter(lambda domain : domain in for_domains, get_domain_list["domains"]) all_known_domains = get_domain_list["domains"]
# check that all requested domains are there # filter inexisting domains
unknown_domains = filter(lambda domain : not domain in domains, for_domains) unknown_domains = filter(lambda domain : not domain in all_known_domains, domains)
# get first unknown domain
unknown_domain = next(unknown_domains, None) unknown_domain = next(unknown_domains, None)
if unknown_domain != None: if unknown_domain != None:
raise YunohostValidationError("domain_name_unknown", domain=unknown_domain) raise YunohostValidationError("domain_name_unknown", domain=unknown_domain)
@ -812,7 +812,6 @@ def domain_setting(domain, key, value=None, delete=False):
domains = _load_domain_settings([ domain ]) domains = _load_domain_settings([ domain ])
if not domain in domains.keys(): if not domain in domains.keys():
# TODO add locales
raise YunohostError("domain_name_unknown", domain=domain) raise YunohostError("domain_name_unknown", domain=domain)
domain_settings = domains[domain] domain_settings = domains[domain]