Be more explicit about domain unknown

This commit is contained in:
Josué Tille 2020-04-06 23:13:50 +02:00
parent a34eebf9cd
commit d563b6a04d
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
3 changed files with 7 additions and 6 deletions

View file

@ -234,6 +234,7 @@
"domain_exists": "The domain already exists",
"domain_hostname_failed": "Could not set new hostname. This might cause an issue later (it might be fine).",
"domain_uninstall_app_first": "One or more apps are installed on this domain. Please uninstall them before proceeding to domain removal",
"domain_named_unknown": "Domain '{domain}' unknown",
"domain_unknown": "Unknown domain",
"domains_available": "Available domains:",
"done": "Done",

View file

@ -1065,7 +1065,7 @@ def app_makedefault(operation_logger, app, domain=None):
domain = app_domain
operation_logger.related_to.append(('domain', domain))
elif domain not in domain_list()['domains']:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=domain)
operation_logger.start()
if '/' in app_map(raw=True)[domain]:

View file

@ -153,7 +153,7 @@ def domain_remove(operation_logger, domain, force=False):
from yunohost.utils.ldap import _get_ldap_interface
if not force and domain not in domain_list()['domains']:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=domain)
# Check domain is not the main domain
if domain == _get_maindomain():
@ -260,7 +260,7 @@ def domain_main_domain(operation_logger, new_main_domain=None):
# Check domain exists
if new_main_domain not in domain_list()['domains']:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=new_main_domain)
operation_logger.related_to.append(('domain', new_main_domain))
operation_logger.start()
@ -329,7 +329,7 @@ def _get_conflicting_apps(domain, path, ignore_app=None):
# Abort if domain is unknown
if domain not in domain_list()['domains']:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=domain)
# This import cannot be put on top of file because it would create a
# recursive import...
@ -440,7 +440,7 @@ def _check_and_normalize_permission_path(url):
path = url[3:].split('/', 1)[1]
if domain not in domains:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=domain)
try:
re.compile(path)
@ -452,7 +452,7 @@ def _check_and_normalize_permission_path(url):
else:
domain = url.split('/')[0]
if domain not in domains:
raise YunohostError('domain_unknown')
raise YunohostError('domain_named_unknown', domain=domain)
if '/' in url:
path = url.split('/', 1)[1].rstrip('/')