From ce9b7aedbe9cfe8de4e576dbe125c5a7161f5f5d Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 16 Aug 2012 07:25:07 -0400 Subject: merged cheetah encoding fixes from maint --- src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py') 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 -- cgit v1.2.3-1-g7c22