diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-12 08:47:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-08-12 08:47:04 -0400 |
| commit | e18ff0f6a6f4c35d47d4f344002878e2ebc0fecb (patch) | |
| tree | ba7bf480f8cb23ec5f699f16ac4c9e16d189eefa /src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | |
| parent | 5c573e00a168c90c5c718566c75aadf736566676 (diff) | |
| parent | 4201e3b68f392869359493ab9462706f4956e387 (diff) | |
| download | bcfg2-e18ff0f6a6f4c35d47d4f344002878e2ebc0fecb.tar.gz bcfg2-e18ff0f6a6f4c35d47d4f344002878e2ebc0fecb.tar.bz2 bcfg2-e18ff0f6a6f4c35d47d4f344002878e2ebc0fecb.zip | |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/Server/Admin/Viz.py
src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Packages/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 7dcc2dccc..5af9c1591 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -551,7 +551,11 @@ class Packages(Bcfg2.Server.Plugin.Plugin, if not self.sources.loaded: # if sources.xml has not received a FAM event yet, defer; # instantiate a dummy Collection object - return Collection(metadata, [], self.cachepath, self.data) + collection = Collection(metadata, [], self.cachepath, self.data) + ckey = collection.cachekey + self.groupcache.setdefault(ckey, dict()) + self.pkgcache.setdefault(ckey, dict()) + return collection if metadata.hostname in self.clients: return self.collections[self.clients[metadata.hostname]] @@ -588,8 +592,8 @@ class Packages(Bcfg2.Server.Plugin.Plugin, if cclass != Collection: self.clients[metadata.hostname] = ckey self.collections[ckey] = collection - self.groupcache.setdefault(ckey, dict()) - self.pkgcache.setdefault(ckey, dict()) + self.groupcache.setdefault(ckey, dict()) + self.pkgcache.setdefault(ckey, dict()) return collection def get_additional_data(self, metadata): |