From aba6d94560658eb8d0abcc787560916038c9d7ac Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 30 Sep 2013 11:29:24 -0400 Subject: Core: Fixed error message on failed altsrc bind --- src/lib/Bcfg2/Server/Core.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 271fb8237..5ec1b5bce 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -648,10 +648,10 @@ class BaseCore(object): del entry.attrib['realname'] return ret except: - entry.set('name', oldname) self.logger.error("Failed binding entry %s:%s with altsrc %s" % - (entry.tag, entry.get('name'), - entry.get('altsrc'))) + (entry.tag, entry.get('realname'), + entry.get('name'))) + entry.set('name', oldname) self.logger.error("Falling back to %s:%s" % (entry.tag, entry.get('name'))) -- cgit v1.2.3-1-g7c22 From 6aa55eda59107d89fe1272f0127fa01f11a61e98 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 1 Oct 2013 10:31:04 -0500 Subject: debian: Add build-depends for 35b53c7 Signed-off-by: Sol Jerome --- debian/control | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/control b/debian/control index 37b72a9f4..aee6f1c24 100644 --- a/debian/control +++ b/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-sphinx (>= 1.0.7+dfsg) | python3-sphinx, python-lxml, python-daemon, + python-boto, python-cherrypy3, python-gamin, python-genshi, -- cgit v1.2.3-1-g7c22 From 7f6c10db41c22b3924539aae19164a9ab9a80468 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Thu, 3 Oct 2013 16:24:05 -0400 Subject: Metadata: import any() from Compat --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index d47fd644b..4a0413a55 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -16,7 +16,9 @@ import Bcfg2.Server.Lint import Bcfg2.Server.Plugin import Bcfg2.Server.FileMonitor from Bcfg2.Utils import locked -from Bcfg2.Compat import MutableMapping, all, wraps # pylint: disable=W0622 +# pylint: disable=W0622 +from Bcfg2.Compat import MutableMapping, all, any, wraps +# pylint: enable=W0622 from Bcfg2.version import Bcfg2VersionInfo try: -- cgit v1.2.3-1-g7c22 From 9a6a231ccb4f509c0f6fa932c97bad647d29af50 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 4 Oct 2013 15:10:36 -0400 Subject: Metadata: read in clients.xml on every write This ensures consistency between the in-memory representation of clients.xml and the representation on disk. If we don't read our writes immediately, there's a race condition when creating a new client: If it asserts its profile or version before the FAM event from the clients.xml edit is processed, then the clients doesn't appear to exist yet, and Bcfg2 complains. --- src/lib/Bcfg2/Server/Plugins/Metadata.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 4a0413a55..047dd4f4e 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -221,6 +221,7 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): sys.exc_info()[1]) self.logger.error(msg) raise Bcfg2.Server.Plugin.MetadataRuntimeError(msg) + self.load_xml() def find_xml_for_xpath(self, xpath): """Find and load xml file containing the xpath query""" -- cgit v1.2.3-1-g7c22 From 3a5eec174af0b9907b29fdfd3eb1e4fd7677beeb Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 9 Oct 2013 11:24:07 -0400 Subject: Packages: fixed metadata.Packages["sources"] --- src/lib/Bcfg2/Server/Plugins/Packages/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py index 3cdcdc162..479138ef1 100644 --- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py @@ -651,7 +651,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin, """ getter for the 'sources' key of the OnDemandDict returned by this function. This delays calling get_collection() until it's absolutely necessary. """ - return self.get_collection(metadata).get_additional_data + return self.get_collection(metadata).get_additional_data() return OnDemandDict( sources=get_sources, -- cgit v1.2.3-1-g7c22