diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-31 11:46:51 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-01-17 10:45:07 -0500 |
| commit | cebd0d7ad54995c37f68586a14540ad64d99d762 (patch) | |
| tree | ac4de894cd8ed43d33890180cfc09cf3a0f90249 /src/lib/Bcfg2/Server/Plugins | |
| parent | 45c7bbf24ae3c6530f33ebb33c062818ad44816d (diff) | |
| download | bcfg2-cebd0d7ad54995c37f68586a14540ad64d99d762.tar.gz bcfg2-cebd0d7ad54995c37f68586a14540ad64d99d762.tar.bz2 bcfg2-cebd0d7ad54995c37f68586a14540ad64d99d762.zip | |
fixed unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 34 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/Yum.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/__init__.py | 1 |
3 files changed, 18 insertions, 19 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index 9c6c7946d..fa993cd85 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -14,8 +14,7 @@ from Bcfg2.Options import get_option_parser try: import genshi.core import genshi.input - from genshi.template import TemplateLoader, \ - TextTemplate, MarkupTemplate, TemplateError + from genshi.template import TemplateLoader, MarkupTemplate, TemplateError HAS_GENSHI = True except ImportError: HAS_GENSHI = False @@ -55,6 +54,7 @@ if HAS_GENSHI: Bcfg2.Server.Plugin.StructFile.__init__(self, name) self.encoding = encoding self.logger = logging.getLogger(name) + self.template = None def HandleEvent(self, event=None): """Handle all fs events for this template.""" @@ -62,22 +62,20 @@ if HAS_GENSHI: return try: loader = TemplateLoader() - try: - self.template = loader.load(self.name, - cls=MarkupTemplate, - encoding=self.encoding) - except LookupError: - err = sys.exc_info()[1] - self.logger.error('Genshi lookup error in %s: %s' % - (self.name, err)) - except TemplateError: - err = sys.exc_info()[1] - self.logger.error('Genshi template error in %s: %s' % - (self.name, err)) - except genshi.input.ParseError: - err = sys.exc_info()[1] - self.logger.error('Genshi parse error in %s: %s' % - (self.name, err)) + self.template = loader.load(self.name, cls=MarkupTemplate, + encoding=self.encoding) + except LookupError: + err = sys.exc_info()[1] + self.logger.error('Genshi lookup error in %s: %s' % + (self.name, err)) + except TemplateError: + err = sys.exc_info()[1] + self.logger.error('Genshi template error in %s: %s' % + (self.name, err)) + except genshi.input.ParseError: + err = sys.exc_info()[1] + self.logger.error('Genshi parse error in %s: %s' % + (self.name, err)) def get_xml_value(self, metadata): """ get the rendered XML data that applies to the given diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py index 17aff900b..859a0657f 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/Yum.py @@ -193,7 +193,7 @@ class PulpCertificateSet(Bcfg2.Server.Plugin.EntrySet): important='true', sensitive='true', paranoid=self.metadata['paranoid']) - self.fam = Bcfg2.Server.FileMonitor.get_fam(). + self.fam = Bcfg2.Server.FileMonitor.get_fam() self.fam.AddMonitor(path, self) def HandleEvent(self, event): diff --git a/src/lib/Bcfg2/Server/Plugins/__init__.py b/src/lib/Bcfg2/Server/Plugins/__init__.py index e69de29bb..1f85702f0 100644 --- a/src/lib/Bcfg2/Server/Plugins/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/__init__.py @@ -0,0 +1 @@ +""" Bcfg2 Plugins """ |