From 555caa9c73ef0ef811ae51460d937341fe2c71e2 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sun, 13 Aug 2017 23:37:12 +0200 Subject: [PATCH] [mod] only check once if the domain exist --- src/yunohost/domain.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/yunohost/domain.py b/src/yunohost/domain.py index a8142fe88..939ebb754 100644 --- a/src/yunohost/domain.py +++ b/src/yunohost/domain.py @@ -76,7 +76,9 @@ def domain_add(auth, domain, dyndns=False): attr_dict = {'objectClass': ['mailDomain', 'top']} - if domain in domain_list(auth)['domains']: + try: + auth.validate_uniqueness({'virtualdomain': domain}) + except MoulinetteError: raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists')) # DynDNS domain @@ -106,11 +108,6 @@ def domain_add(auth, domain, dyndns=False): try: yunohost.certificate._certificate_install_selfsigned([domain], False) - try: - auth.validate_uniqueness({'virtualdomain': domain}) - except MoulinetteError: - raise MoulinetteError(errno.EEXIST, m18n.n('domain_exists')) - attr_dict['virtualdomain'] = domain if not auth.add('virtualdomain=%s,ou=domains' % domain, attr_dict):