diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 11:10:43 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-20 11:10:43 -0400 |
| commit | 10d60b35ce384d4b73fd63939aa65b07e9032a12 (patch) | |
| tree | dbda095dca372c38d15a32a490adc2f2b16f0d83 /src/lib/Bcfg2/Server/Plugins | |
| parent | 5945f7f16a40066f748808c35d1db4dd0de291b6 (diff) | |
| download | bcfg2-10d60b35ce384d4b73fd63939aa65b07e9032a12.tar.gz bcfg2-10d60b35ce384d4b73fd63939aa65b07e9032a12.tar.bz2 bcfg2-10d60b35ce384d4b73fd63939aa65b07e9032a12.zip | |
fixed unit tests
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Bundler.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 2 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Properties.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index d114b0873..2473a3ed2 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -12,7 +12,7 @@ from genshi.template import TemplateError class BundleFile(Bcfg2.Server.Plugin.StructFile): """ Representation of a bundle XML file """ - bundle_name_re = re.compile('^(?P<name>.*)\.(xml|genshi)$') + bundle_name_re = re.compile(r'^(?P<name>.*)\.(xml|genshi)$') def __init__(self, filename, should_monitor=False): Bcfg2.Server.Plugin.StructFile.__init__(self, filename, diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 07e580bc3..567a16c40 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -320,7 +320,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, for struct in structures: for pkg in struct.xpath('//Package | //BoundPackage'): if pkg.get("name"): - base.update(collection.packages_from_entry(pkg)) + initial.update(collection.packages_from_entry(pkg)) elif pkg.get("group"): groups.append((pkg.get("group"), pkg.get("type"))) diff --git a/src/lib/Bcfg2/Server/Plugins/Properties.py b/src/lib/Bcfg2/Server/Plugins/Properties.py index f091acf01..8e54da19b 100644 --- a/src/lib/Bcfg2/Server/Plugins/Properties.py +++ b/src/lib/Bcfg2/Server/Plugins/Properties.py @@ -240,7 +240,6 @@ class Properties(Bcfg2.Server.Plugin.Plugin, ignore = re.compile(r'.*\.xsd$') def __init__(self, core, datastore): - global SETUP # pylint: disable=W0603 Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) Bcfg2.Server.Plugin.Connector.__init__(self) Bcfg2.Server.Plugin.DirectoryBacked.__init__(self, self.data) |