diff options
author | Sol Jerome <solj@ices.utexas.edu> | 2009-02-03 01:20:09 +0000 |
---|---|---|
committer | Sol Jerome <solj@ices.utexas.edu> | 2009-02-03 01:20:09 +0000 |
commit | 6d67c1204b70c690f04dc81932a277141cf83128 (patch) | |
tree | 76b6f27fbdadc99aff790124a8f8a6571f379b8c /src | |
parent | 85002c8627ab302f4f3fed668b67b9bbffcc08aa (diff) | |
download | bcfg2-6d67c1204b70c690f04dc81932a277141cf83128.tar.gz bcfg2-6d67c1204b70c690f04dc81932a277141cf83128.tar.bz2 bcfg2-6d67c1204b70c690f04dc81932a277141cf83128.zip |
Prevent Genshi traceback for unknown encodings
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5062 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/Server/Plugins/TGenshi.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/TGenshi.py b/src/lib/Server/Plugins/TGenshi.py index 3743517a9..102c95fc2 100644 --- a/src/lib/Server/Plugins/TGenshi.py +++ b/src/lib/Server/Plugins/TGenshi.py @@ -49,8 +49,11 @@ class TemplateFile: return try: loader = TemplateLoader() - self.template = loader.load(self.name, cls=self.template_cls, - encoding=self.encoding) + try: + self.template = loader.load(self.name, cls=self.template_cls, + encoding=self.encoding) + except LookupError, lerror: + logger.error('Genshi lookup error: %s' % lerror) except TemplateError, terror: logger.error('Genshi template error: %s' % terror) except genshi.input.ParseError, perror: |