3 files changed, 27 insertions, 17 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py
index cff9ff61e..71aec7658 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgJinja2Generator.py
@@ -12,14 +12,14 @@ from Bcfg2.Server.Plugins.Cfg import CfgGenerator
 try:
     from jinja2 import Environment, FileSystemLoader
     HAS_JINJA2 = True
-except ImportError:
-    HAS_JINJA2 = False
 
+    class RelEnvironment(Environment):
+        """Override join_path() to enable relative template paths."""
+        def join_path(self, template, parent):
+            return os.path.join(os.path.dirname(parent), template)
 
-class RelEnvironment(Environment):
-    """Override join_path() to enable relative template paths."""
-    def join_path(self, template, parent):
-        return os.path.join(os.path.dirname(parent), template)
+except ImportError:
+    HAS_JINJA2 = False
 
 
 class DefaultJinja2DataProvider(DefaultTemplateDataProvider):
@@ -42,15 +42,16 @@ class CfgJinja2Generator(CfgGenerator):
     #: Handle .jinja2 files
     __extensions__ = ['jinja2']
 
-    #: ``__loader_cls__`` is the class that will be instantiated to
-    #: load the template files.  It must implement one public function,
-    #: ``load()``, as :class:`genshi.template.TemplateLoader`.
-    __loader_cls__ = FileSystemLoader
+    if HAS_JINJA2:
+        #: ``__loader_cls__`` is the class that will be instantiated to
+        #: load the template files.  It must implement one public function,
+        #: ``load()``, as :class:`genshi.template.TemplateLoader`.
+        __loader_cls__ = FileSystemLoader
 
-    #: ``__environment_cls__`` is the class that will be instantiated to
-    #: store the jinja2 environment.  It must implement one public function,
-    #: ``get_template()``, as :class:`jinja2.Environment`.
-    __environment_cls__ = RelEnvironment
+        #: ``__environment_cls__`` is the class that will be instantiated to
+        #: store the jinja2 environment.  It must implement one public
+        #: function, ``get_template()``, as :class:`jinja2.Environment`.
+        __environment_cls__ = RelEnvironment
 
     #: Ignore ``.jinja2_include`` files so they can be used with the
     #: Jinja2 ``{% include ... %}`` directive without raising warnings.
@@ -68,7 +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)
+        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):
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py
index a158302be..241bce34c 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgSSLCAKeyCreator.py
@@ -19,8 +19,8 @@ class CfgSSLCAKeyCreator(XMLCfgCreator):
         self.logger.info("Cfg: Generating new SSL key for %s" % self.name)
         spec = self.XMLMatch(metadata)
         key = spec.find("Key")
-        if not key:
-            key = dict()
+        if key is None:
+            key = {}
         ktype = key.get('type', 'rsa')
         bits = key.get('bits', '2048')
         if ktype == 'rsa':
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
index 355e53588..dae03144a 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py
@@ -878,6 +878,7 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
     options = Bcfg2.Server.Plugin.GroupSpool.options + [
         Bcfg2.Options.BooleanOption(
             '--cfg-validation', cf=('cfg', 'validation'), default=True,
+            dest="cfg_validation",
             help='Run validation on Cfg files'),
         Bcfg2.Options.Option(
             cf=('cfg', 'category'), dest="cfg_category",