diff options
| author | Gordon Messmer <gordon@dragonsdawn.net> | 2015-09-09 17:59:02 -0700 |
|---|---|---|
| committer | Gordon Messmer <gordon@dragonsdawn.net> | 2015-09-09 17:59:02 -0700 |
| commit | 8c6e55b967c78d09328f3081ababe2db0610c3eb (patch) | |
| tree | 5573bc8b6ae6741753090c4495bb0ed7e8fdad95 | |
| parent | 38121cf71bb1a92700a438e516c1402480917ef4 (diff) | |
| download | bcfg2-8c6e55b967c78d09328f3081ababe2db0610c3eb.tar.gz bcfg2-8c6e55b967c78d09328f3081ababe2db0610c3eb.tar.bz2 bcfg2-8c6e55b967c78d09328f3081ababe2db0610c3eb.zip | |
Compatibility with Jinja < 2.7.
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py index 4691b80cf..71aec7658 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py @@ -69,9 +69,15 @@ class CfgJinja2Generator(CfgGenerator): encoding = Bcfg2.Options.setup.encoding self.loader = self.__loader_cls__('/', encoding=encoding) - self.environment = \ - self.__environment_cls__(loader=self.loader, - keep_trailing_newline=True) + try: + # keep_trailing_newline is new in Jinja2 2.7, and will + # fail with earlier versions + self.environment = \ + self.__environment_cls__(loader=self.loader, + keep_trailing_newline=True) + except TypeError: + self.environment = \ + self.__environment_cls__(loader=self.loader) __init__.__doc__ = CfgGenerator.__init__.__doc__ def get_data(self, entry, metadata): |