From e6814a42f5d0bad73278b2dbbbc43396d78d4edf Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 23 Mar 2010 21:46:02 +0000 Subject: Viz: Include xincluded files from groups.xml (Resolves Ticket #867) Signed-off-by: Sol Jerome git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5790 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Metadata.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index ab25a737c..6b2ad1d7b 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -725,6 +725,10 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, def viz(self, hosts, bundles, key, colors): '''admin mode viz support''' groups_tree = lxml.etree.parse(self.data + "/groups.xml") + try: + groups_tree.xinclude() + except lxml.etree.XincludeError: + self.logger.error("Failed to process XInclude for file %s" % dest) groups = groups_tree.getroot() categories = {'default':'grey83'} instances = {} -- cgit v1.2.3-1-g7c22