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/CfgCheetahGenerator.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/CfgCheetahGenerator.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py index 3edd1d8cb..e74b77e83 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgCheetahGenerator.py @@ -6,8 +6,7 @@ from Bcfg2.Server.Plugins.Cfg import CfgGenerator logger = logging.getLogger(__name__) try: - import Cheetah.Template - import Cheetah.Parser + from Cheetah.Template import Template have_cheetah = True except ImportError: have_cheetah = False @@ -25,9 +24,8 @@ class CfgCheetahGenerator(CfgGenerator): raise Bcfg2.Server.Plugin.PluginExecutionError(msg) def get_data(self, entry, metadata): - template = Cheetah.Template.Template(self.data, - compilerSettings=self.settings) + template = Template(self.data, compilerSettings=self.settings) template.metadata = metadata template.path = entry.get('realname', entry.get('name')) - template.source_path = self.path + template.source_path = self.name return template.respond() |