summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-11-13 17:04:42 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-11-13 17:04:42 -0500
commit3787db7a50f70e1c8cb575546949f32c2958fe20 (patch)
treed1f35ec1e3c68cb950d84ae301e5551007fe6de5 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
parentee16ced43e5050455368bb794e1fdfbba8eaa9f0 (diff)
downloadbcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.tar.gz
bcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.tar.bz2
bcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.zip
Cfg: improved error messages
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
index feedbdb1b..130652aef 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py
@@ -1,7 +1,6 @@
""" Handle encrypted Genshi templates (.crypt.genshi or .genshi.crypt
files) """
-import logging
from Bcfg2.Compat import StringIO
from Bcfg2.Server.Plugin import PluginExecutionError
from Bcfg2.Server.Plugins.Cfg import SETUP
@@ -19,10 +18,6 @@ except ImportError:
# CfgGenshiGenerator will raise errors if genshi doesn't exist
TemplateLoader = object # pylint: disable=C0103
-LOGGER = logging.getLogger(__name__)
-
-LOGGER = logging.getLogger(__name__)
-
class EncryptedTemplateLoader(TemplateLoader):
""" Subclass :class:`genshi.template.TemplateLoader` to decrypt
@@ -53,6 +48,4 @@ class CfgEncryptedGenshiGenerator(CfgGenshiGenerator):
def __init__(self, fname, spec, encoding):
CfgGenshiGenerator.__init__(self, fname, spec, encoding)
if not HAS_CRYPTO:
- msg = "Cfg: M2Crypto is not available"
- LOGGER.error(msg)
- raise PluginExecutionError(msg)
+ raise PluginExecutionError("M2Crypto is not available")