diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 09:40:20 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-21 09:40:20 -0400 |
| commit | 70d67a417957cb16f0307be0677a346cc9e724f5 (patch) | |
| tree | 6c5a55cd43fb2b86e74dda3456310b4d819b3c46 /src/lib/Bcfg2/Server/Plugins | |
| parent | d78e0cc91947a06ae7687cb54f805787fb00d28f (diff) | |
| download | bcfg2-70d67a417957cb16f0307be0677a346cc9e724f5.tar.gz bcfg2-70d67a417957cb16f0307be0677a346cc9e724f5.tar.bz2 bcfg2-70d67a417957cb16f0307be0677a346cc9e724f5.zip | |
fixes for missing genshi
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py index 649bc38a5..6605cca7c 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenshiGenerator.py @@ -10,7 +10,7 @@ try: from genshi.template import TemplateLoader except ImportError: # CfgGenshiGenerator will raise errors if genshi doesn't exist - pass + TemplateLoader = object class EncryptedTemplateLoader(TemplateLoader): diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py index 4e0ff8534..5447717d8 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgGenshiGenerator.py @@ -28,12 +28,12 @@ class CfgGenshiGenerator(CfgGenerator): def __init__(self, fname, spec, encoding): CfgGenerator.__init__(self, fname, spec, encoding) - self.loader = self.__loader_cls__() - self.template = None if not have_genshi: - msg = "Cfg: Genshi is not available: %s" % entry.get("name") + msg = "Cfg: Genshi is not available: %s" % fname logger.error(msg) raise Bcfg2.Server.Plugin.PluginExecutionError(msg) + self.loader = self.__loader_cls__() + self.template = None @classmethod def ignore(cls, event, basename=None): |