diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2011-05-31 10:36:15 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2011-06-14 12:36:46 -0500 |
| commit | 99495c559da8bb432274e94248f98d9b34c2d205 (patch) | |
| tree | e12b77d4a47bfd113d086a18acb5d9ae01546917 /src/lib/Server/Plugins/Cfg.py | |
| parent | be72eb8b648672707822f891a103fc75ed54dbd2 (diff) | |
| download | bcfg2-99495c559da8bb432274e94248f98d9b34c2d205.tar.gz bcfg2-99495c559da8bb432274e94248f98d9b34c2d205.tar.bz2 bcfg2-99495c559da8bb432274e94248f98d9b34c2d205.zip | |
Cfg: Fix traceback for non-ascii files
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Server/Plugins/Cfg.py')
| -rw-r--r-- | src/lib/Server/Plugins/Cfg.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py index 832f7ab41..5e3cca847 100644 --- a/src/lib/Server/Plugins/Cfg.py +++ b/src/lib/Server/Plugins/Cfg.py @@ -162,6 +162,13 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): logger.error("Failed to decode %s: %s" % (entry.get('name'), e)) logger.error("Please verify you are using the proper encoding.") raise Bcfg2.Server.Plugin.PluginExecutionError + except ValueError: + e = sys.exc_info()[1] + logger.error("Error in specification for %s" % entry.get('name')) + logger.error("%s" % e) + logger.error("You need to specify base64 encoding for %s." % + entry.get('name')) + raise Bcfg2.Server.Plugin.PluginExecutionError if entry.text in ['', None]: entry.set('empty', 'true') |