diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-16 07:25:07 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-08-22 08:31:06 -0400 |
| commit | ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d (patch) | |
| tree | c9ec96afeb1066c6ec4a2780a12a39349b213374 /src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py | |
| parent | d065f384846867fbee14be74209a1e56436314e8 (diff) | |
| download | bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.tar.gz bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.tar.bz2 bcfg2-ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d.zip | |
merged cheetah encoding fixes from maint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py index e74b77e83..f02461673 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py @@ -24,7 +24,8 @@ class CfgCheetahGenerator(CfgGenerator): raise Bcfg2.Server.Plugin.PluginExecutionError(msg) def get_data(self, entry, metadata): - template = Template(self.data, compilerSettings=self.settings) + template = Template(self.data.decode(self.encoding), + compilerSettings=self.settings) template.metadata = metadata template.path = entry.get('realname', entry.get('name')) template.source_path = self.name |