diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-17 15:04:23 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-17 15:04:23 -0400 |
| commit | 64adcb62667adefc885bfcc5ae0f934300a96db3 (patch) | |
| tree | 1669e41db1f4ba1b0390dcbd78bce8a275600c16 /src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | |
| parent | 817b4e4b49867288648603c711be388fcbf62265 (diff) | |
| download | bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.tar.gz bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.tar.bz2 bcfg2-64adcb62667adefc885bfcc5ae0f934300a96db3.zip | |
fixed encrypted genshi/cheetah generators
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 |