From 595f897261371d4d76a4725aacab59ea634a93cf Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Sat, 3 Dec 2016 11:34:46 +0100 Subject: [PATCH] [fix] implement opi's feedback --- locales/en.json | 2 +- src/yunohost/tools.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/locales/en.json b/locales/en.json index 5bc3b7bdb..acbd0ed98 100644 --- a/locales/en.json +++ b/locales/en.json @@ -114,7 +114,7 @@ "ip6tables_unavailable": "You cannot play with ip6tables here. You are either in a container or your kernel does not support it.", "iptables_unavailable": "You cannot play with iptables here. You are either in a container or your kernel does not support it.", "ldap_initialized": "LDAP has been initialized", - "ldap_init_failed_to_create_admin": "LDAP initialization failed to create admin. Aborting.", + "ldap_init_failed_to_create_admin": "LDAP initialization failed to create admin user.", "license_undefined": "undefined", "mail_alias_remove_failed": "Unable to remove mail alias '{mail:s}'", "mail_domain_unknown": "Unknown mail address domain '{domain:s}'", diff --git a/src/yunohost/tools.py b/src/yunohost/tools.py index 671a7304c..e92729129 100644 --- a/src/yunohost/tools.py +++ b/src/yunohost/tools.py @@ -100,8 +100,8 @@ def tools_ldapinit(): try: pwd.getpwnam("admin") except KeyError: - raise MoulinetteError(errno.EINVAL, - m18n.n('ldap_init_failed_to_create_admin')) + logger.error(m18n.n('ldap_init_failed_to_create_admin')) + raise MoulinetteError(errno.EINVAL, m18n.n('installation_failed')) logger.success(m18n.n('ldap_initialized')) return auth