summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-08 08:12:47 -0500
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-02-08 08:12:47 -0500
commite1edce98761782fe51c451be4f5e114c75f46bd5 (patch)
treee7a5cb607b9173d8ab53eca1da20a2be72981846 /src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
parent55807333ccb7d80c4e2f074c2a1a10f554e57289 (diff)
downloadbcfg2-e1edce98761782fe51c451be4f5e114c75f46bd5.tar.gz
bcfg2-e1edce98761782fe51c451be4f5e114c75f46bd5.tar.bz2
bcfg2-e1edce98761782fe51c451be4f5e114c75f46bd5.zip
Cfg: better error handling from verifiers, :test
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index fcfaa393b..ec3ba222c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -589,11 +589,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet,
try:
self._validate_data(entry, metadata, data)
except CfgVerificationError:
- msg = "Data for %s for %s failed to verify: %s" % \
- (entry.get('name'), metadata.hostname,
- sys.exc_info()[1])
- self.logger.error(msg)
- raise PluginExecutionError(msg)
+ raise PluginExecutionError("Failed to verify %s for %s: %s" %
+ (entry.get('name'),
+ metadata.hostname,
+ sys.exc_info()[1]))
if entry.get('encoding') == 'base64':
data = b64encode(data)