diff options
| author | Sol Jerome <solj@ices.utexas.edu> | 2010-03-23 21:46:02 +0000 |
|---|---|---|
| committer | Sol Jerome <solj@ices.utexas.edu> | 2010-03-25 17:19:43 -0500 |
| commit | e6814a42f5d0bad73278b2dbbbc43396d78d4edf (patch) | |
| tree | 925afbd087c9ce44d3ce801d75b2001f2efd57a4 /src | |
| parent | 08b6963f5511662441f43dfcc6d7df05fed8a9b0 (diff) | |
| download | bcfg2-e6814a42f5d0bad73278b2dbbbc43396d78d4edf.tar.gz bcfg2-e6814a42f5d0bad73278b2dbbbc43396d78d4edf.tar.bz2 bcfg2-e6814a42f5d0bad73278b2dbbbc43396d78d4edf.zip | |
Viz: Include xincluded files from groups.xml (Resolves Ticket #867)
Signed-off-by: Sol Jerome <solj@ices.utexas.edu>
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5790 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 4 |
1 files changed, 4 insertions, 0 deletions
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 = {} |