diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-05-21 10:20:19 -0400 |
| commit | fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c (patch) | |
| tree | 5bed1930ce1edac533317749daba26680934f640 /src/lib/Bcfg2/Server/Plugins | |
| parent | 29f98cdba4d7babc9fa8c0d479059060edc9aa2b (diff) | |
| parent | 1690cf04ca2b63f8312670dc6f9067fae5c8cd73 (diff) | |
| download | bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.gz bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.tar.bz2 bcfg2-fdeba3b8f2cea7ecb2200cab42ce28fd1e1e6a5c.zip | |
Merge branch 'maint'
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 6 | ||||
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 2bc82caa9..507973fa6 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -556,6 +556,12 @@ class Metadata(Bcfg2.Server.Plugin.Metadata, open(os.path.join(repo, cls.name, fname), "w").write(kwargs[aname]) + @property + def use_database(self): + """ Expose self._use_db publicly for use in + :class:`Bcfg2.Server.MultiprocessingCore.ChildCore` """ + return self._use_db + def _handle_file(self, fname): """ set up the necessary magic for handling a metadata file (clients.xml or groups.xml, e.g.) """ diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 567a16c40..8c272cf53 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -512,8 +512,9 @@ class Packages(Bcfg2.Server.Plugin.Plugin, collection = cclass(metadata, relevant, self.cachepath, self.data, debug=self.debug_flag) ckey = collection.cachekey - self.clients[metadata.hostname] = ckey - self.collections[ckey] = collection + if cclass != Collection: + self.clients[metadata.hostname] = ckey + self.collections[ckey] = collection return collection def get_additional_data(self, metadata): |