diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-13 17:04:42 -0500 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-11-13 17:04:42 -0500 |
commit | 3787db7a50f70e1c8cb575546949f32c2958fe20 (patch) | |
tree | d1f35ec1e3c68cb950d84ae301e5551007fe6de5 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py | |
parent | ee16ced43e5050455368bb794e1fdfbba8eaa9f0 (diff) | |
download | bcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.tar.gz bcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.tar.bz2 bcfg2-3787db7a50f70e1c8cb575546949f32c2958fe20.zip |
Cfg: improved error messages
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py index 00b95c970..da506a195 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgDiffFilter.py @@ -1,14 +1,11 @@ """ Handle .diff files, which apply diffs to plaintext files """ import os -import logging import tempfile -import Bcfg2.Server.Plugin +from Bcfg2.Server.Plugin import PluginExecutionError from subprocess import Popen, PIPE from Bcfg2.Server.Plugins.Cfg import CfgFilter -LOGGER = logging.getLogger(__name__) - class CfgDiffFilter(CfgFilter): """ CfgDiffFilter applies diffs to plaintext @@ -32,8 +29,7 @@ class CfgDiffFilter(CfgFilter): output = open(basename, 'r').read() os.unlink(basename) if ret != 0: - msg = "Error applying diff %s: %s" % (self.name, stderr) - LOGGER.error(msg) - raise Bcfg2.Server.Plugin.PluginExecutionError(msg) + raise PluginExecutionError("Error applying diff %s: %s" % + (self.name, stderr)) return output modify_data.__doc__ = CfgFilter.modify_data.__doc__ |