diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-05-21 11:38:19 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-05-21 11:38:19 -0500 |
| commit | bf24d9ca6dbbc2e27a92d25562e7129c1c1e708c (patch) | |
| tree | e20ca0f828b558e13e945c3af329af3f0146f072 /src/lib/Bcfg2/Server/Plugins/Bundler.py | |
| parent | 64b86fda18be46990bc6d29dc2aa212f5066df99 (diff) | |
| download | bcfg2-bf24d9ca6dbbc2e27a92d25562e7129c1c1e708c.tar.gz bcfg2-bf24d9ca6dbbc2e27a92d25562e7129c1c1e708c.tar.bz2 bcfg2-bf24d9ca6dbbc2e27a92d25562e7129c1c1e708c.zip | |
Bundler: Fix genshi import
Wasn't properly importing genshi previously.
>>> import genshi.template.base.TemplateError
Traceback (most recent call last):
File "<input>", line 1, in <module>
ImportError: No module named TemplateError
>>> import genshi.template.base
>>> genshi.template.base.TemplateError
<class 'genshi.template.base.TemplateError'>
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Bundler.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index 1d1171782..cbaa85089 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -10,7 +10,7 @@ import Bcfg2.Server import Bcfg2.Server.Plugin try: - import genshi.template.base.TemplateError + import genshi.template.base from Bcfg2.Server.Plugins.SGenshi import SGenshiTemplateFile have_genshi = True except: @@ -82,7 +82,7 @@ class Bundler(Bcfg2.Server.Plugin.Plugin, continue try: bundleset.append(entries[0].get_xml_value(metadata)) - except TemplateError: + except genshi.template.base.TemplateError: t = sys.exc_info()[1] self.logger.error("Bundler: Failed to template genshi bundle %s" % bundlename) |