From dded1cb7754ad6422e79110cc6c8beb6b5e546a9 Mon Sep 17 00:00:00 2001
From: Alexandre Aubin <alex.aubin@mailoo.org>
Date: Sat, 28 Aug 2021 21:49:35 +0200
Subject: [PATCH] Moar fikses

---
 src/yunohost/dns.py    | 19 +++++++++++++++++--
 src/yunohost/domain.py | 15 ---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/yunohost/dns.py b/src/yunohost/dns.py
index ce0fc7a7d..3943f7ed3 100644
--- a/src/yunohost/dns.py
+++ b/src/yunohost/dns.py
@@ -95,6 +95,21 @@ def domain_dns_conf(domain):
     return result
 
 
+def _list_subdomains_of(parent_domain):
+
+    domain_list_ = domain_list()["domains"]
+
+    if parent_domain not in domain_list_:
+        raise YunohostError("domain_name_unknown", domain=domain)
+
+    out = []
+    for domain in domain_list_:
+        if domain.endswith(f".{parent_domain}"):
+            out.append(domain)
+
+    return out
+
+
 def _build_dns_conf(base_domain):
     """
     Internal function that will returns a data structure containing the needed
@@ -163,7 +178,7 @@ def _build_dns_conf(base_domain):
 
         # FIXME: shouldn't the basename just be based on the dns_zone setting of this domain ?
         basename = domain.replace(f"{base_dns_zone}", "").rstrip(".") or "@"
-        suffix = f".{basename}" if base_name != "@" else ""
+        suffix = f".{basename}" if basename != "@" else ""
 
         ttl = settings["ttl"]
 
@@ -423,7 +438,7 @@ def domain_registrar_set(domain, registrar, args):
 
     registrars = read_yaml(REGISTRAR_LIST_PATH)
     if registrar not in registrars.keys():
-        raise YunohostValidationError("domain_registrar_unknown"i, registrar=registrar)
+        raise YunohostValidationError("domain_registrar_unknown", registrar=registrar)
 
     parameters = registrars[registrar]
     ask_args = []
diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py
index ad6cc99dc..8bb6f5a34 100644
--- a/src/yunohost/domain.py
+++ b/src/yunohost/domain.py
@@ -476,21 +476,6 @@ def domain_setting(domain, key, value=None, delete=False):
         _set_domain_settings(domain, domain_settings)
 
 
-def _list_subdomains_of(parent_domain):
-
-    domain_list_ = domain_list()["domains"]
-
-    if parent_domain not in domain_list_:
-        raise YunohostError("domain_name_unknown", domain=domain)
-
-    out = []
-    for domain in domain_list_:
-        if domain.endswith(f".{parent_domain}"):
-            out.append(domain)
-
-    return out
-
-
 def _set_domain_settings(domain, domain_settings):
     """
     Set settings of a domain