diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:07 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-11 13:27:17 -0400 |
commit | afeeb2b6430875cc3979ae4ad690d2a3efc0ac68 (patch) | |
tree | 8e68a03334c5f21cd0974c757b49ef75413d1c18 /src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py | |
parent | c5b4bfd842a6f03a4c840cd32c3a99bcc57a8c48 (diff) | |
download | bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.gz bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.tar.bz2 bcfg2-afeeb2b6430875cc3979ae4ad690d2a3efc0ac68.zip |
moved plugin-specific configs to main config file; propagate "setup" object to server Core
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py index a966268c0..7796b9e34 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py @@ -9,7 +9,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, Bcfg2.Server.Plugin.Debuggable): __identifier__ = None - def __init__(self, filename, cachepath, fam, packages, config): + def __init__(self, filename, cachepath, fam, packages, setup): Bcfg2.Server.Plugin.Debuggable.__init__(self) try: Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, @@ -24,7 +24,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, raise Bcfg2.Server.Plugin.PluginInitError(msg) Bcfg2.Server.Plugin.StructFile.__init__(self, filename) self.cachepath = cachepath - self.config = config + self.setup = setup if not os.path.exists(self.cachepath): # create cache directory if needed try: @@ -56,7 +56,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, self.parsed.add(fname) break - if self.config.loaded and self.loaded: + if self.loaded: self.logger.info("Reloading Packages plugin") self.pkg_obj.Reload() @@ -91,7 +91,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, return None try: - source = cls(self.cachepath, xsource, self.config) + source = cls(self.cachepath, xsource, self.setup) except SourceInitError: err = sys.exc_info()[1] self.logger.error("Packages: %s" % err) |