From 64adcb62667adefc885bfcc5ae0f934300a96db3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 17 May 2012 15:04:23 -0400 Subject: fixed encrypted genshi/cheetah generators --- src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py') diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index 500c1e394..38400d984 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -287,6 +287,10 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet): logger.error("You need to specify base64 encoding for %s." % entry.get('name')) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) + except TypeError: + # data is already unicode; newer versions of Cheetah + # seem to return unicode + pass if data: entry.text = data -- cgit v1.2.3-1-g7c22