From d563b6a04d006415130db337e345d5834bee3376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Josu=C3=A9=20Tille?= <josue@tille.ch>
Date: Mon, 6 Apr 2020 23:13:50 +0200
Subject: [PATCH] Be more explicit about domain unknown

---
 locales/en.json        |  1 +
 src/yunohost/app.py    |  2 +-
 src/yunohost/domain.py | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 564c0b821..47425d0c3 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -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",
diff --git a/src/yunohost/app.py b/src/yunohost/app.py
index 3d3d5ca34..c99255eb6 100644
--- a/src/yunohost/app.py
+++ b/src/yunohost/app.py
@@ -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]:
diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index 06bfedf1a..c3579c805 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -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('/')