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

Make sure to use a keyword argument since we have a new arg

Browse source
This commit is contained in:
Alexandre Aubin 2021-01-10 01:51:39 +01:00
parent fffbd2d10f
commit b5bbb44a95
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/yunohost/domain.py
View file

@ -161,7 +161,7 @@ def domain_add(operation_logger, domain, dyndns=False):
except Exception: except Exception:
# Force domain removal silently # Force domain removal silently
try: try:
domain_remove(domain, True) domain_remove(domain, force=True)
except Exception: except Exception:
pass pass
raise raise
@ -187,6 +187,9 @@ def domain_remove(operation_logger, domain, remove_apps=False, force=False):
from yunohost.app import app_ssowatconf, app_info, app_remove from yunohost.app import app_ssowatconf, app_info, app_remove
from yunohost.utils.ldap import _get_ldap_interface from yunohost.utils.ldap import _get_ldap_interface
# the 'force' here is related to the exception happening in domain_add ...
# we don't want to check the domain exists because the ldap add may have
# failed
if not force and domain not in domain_list()['domains']: if not force and domain not in domain_list()['domains']:
raise YunohostError('domain_name_unknown', domain=domain) raise YunohostError('domain_name_unknown', domain=domain)