diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 13:34:59 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-09-20 13:34:59 -0400 |
| commit | d76f0d1fd29d06a17727ef3f20c612e3ce5c52a9 (patch) | |
| tree | c71c188d578d52a93b19b5a7eb5eed6bf8533cb4 /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | c2d12242323594a7f6223d36cc2b608e5621adc8 (diff) | |
| download | bcfg2-d76f0d1fd29d06a17727ef3f20c612e3ce5c52a9.tar.gz bcfg2-d76f0d1fd29d06a17727ef3f20c612e3ce5c52a9.tar.bz2 bcfg2-d76f0d1fd29d06a17727ef3f20c612e3ce5c52a9.zip | |
Packages: fixed reload on server startup
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index c74aa77d9..e5b53cb26 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -383,7 +383,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, self.clients = dict() self.collections = dict() - for source in self.sources: + for source in self.sources.entries: cachefiles.add(source.cachefile) if not self.disableMetaData: source.setup_data(force_update) @@ -410,7 +410,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, """ keyfiles = [] keys = [] - for source in self.sources: + for source in self.sources.entries: for key in source.gpgkeys: localfile = os.path.join(self.keypath, os.path.basename(key.rstrip("/"))) @@ -436,9 +436,9 @@ class Packages(Bcfg2.Server.Plugin.Plugin, :param metadata: The client metadata to get a Collection for :type metadata: Bcfg2.Server.Plugins.Metadata.ClientMetadata :returns: An instance of the appropriate subclass of - :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection` - that contains all relevant sources that apply to the - given client + :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection` + that contains all relevant sources that apply to the + given client """ if not self.sources.loaded: @@ -452,14 +452,15 @@ class Packages(Bcfg2.Server.Plugin.Plugin, sclasses = set() relevant = list() - for source in self.sources: + for source in self.sources.entries: if source.applies(metadata): relevant.append(source) sclasses.update([source.__class__]) if len(sclasses) > 1: - self.logger.warning("Packages: Multiple source types found for %s: " - "%s" % ",".join([s.__name__ for s in sclasses])) + self.logger.warning("Packages: Multiple source types found for " + "%s: %s" % + ",".join([s.__name__ for s in sclasses])) cclass = Collection elif len(sclasses) == 0: self.logger.error("Packages: No sources found for %s" % |