From e64e3ceab0f4718d6e215e1710133e886ac67922 Mon Sep 17 00:00:00 2001 From: James Kasten Date: Thu, 30 Jul 2015 01:19:02 -0700 Subject: [PATCH] Proper misconfiguration message --- letsencrypt-apache/letsencrypt_apache/configurator.py | 4 ++-- letsencrypt/display/ops.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/letsencrypt-apache/letsencrypt_apache/configurator.py b/letsencrypt-apache/letsencrypt_apache/configurator.py index 7b1144e2e..f2c43f8bf 100644 --- a/letsencrypt-apache/letsencrypt_apache/configurator.py +++ b/letsencrypt-apache/letsencrypt_apache/configurator.py @@ -1009,8 +1009,8 @@ class ApacheConfigurator(augeas_configurator.AugeasConfigurator): """ try: le_util.run_script([self.conf("ctl"), "configtest"]) - except errors.SubprocessError: - raise errors.MisconfigurationError("Config Test failed!") + except errors.SubprocessError as err: + raise errors.MisconfigurationError(str(err)) def get_version(self): """Return version of Apache Server. diff --git a/letsencrypt/display/ops.py b/letsencrypt/display/ops.py index a566031a1..de5af2e0d 100644 --- a/letsencrypt/display/ops.py +++ b/letsencrypt/display/ops.py @@ -84,8 +84,9 @@ def pick_plugin(config, default, plugins, question, ifaces): logger.debug("Single candidate plugin: %s", plugin_ep) if plugin_ep.misconfigured: logger.warning( - "Only candidate plugin, %s, is misconfigured." - "Please fix the configuration before proceeding.", plugin_ep) + "Only candidate plugin, %s, is misconfigured. " + "Please fix the configuration before proceeding.", + plugin_ep.name) return None return plugin_ep.init() else: