From 98643130324d5523e2c819a0d6499ff88e5a6673 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Sun, 23 Jan 2011 11:31:11 -0600 Subject: Metadata: Gracefully handle failed profile updates to clients.xml using xinclude files --- src/lib/Server/Plugins/Metadata.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/Server/Plugins/Metadata.py') diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index fe4d57361..fde0ab77c 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -468,7 +468,11 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, if client in self.clients: self.logger.info("Changing %s group from %s to %s" % (client, self.clients[client], profile)) cli = self.clientdata_original.xpath('.//Client[@name="%s"]' % (client)) - cli[0].set('profile', profile) + if len(cli) > 0: + cli[0].set('profile', profile) + else: + """Try to find the client in included files""" + self.logger.error("Metadata: Unable to update profile for client %s. Use of Xinclude?" % client) else: self.logger.info("Creating new client: %s, profile %s" % \ (client, profile)) -- cgit v1.2.3-1-g7c22