summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2007-01-11 20:37:08 +0000
committerNarayan Desai <desai@mcs.anl.gov>2007-01-11 20:37:08 +0000
commit86c6c58097b2596faf7760e43edd14ba4a6bc02b (patch)
tree2c105b5a0b9c016c05f03cba3f7d6229e350a355
parent8b9f7daf4404c0c49b19bdc534a6607d8a0cd1e7 (diff)
downloadbcfg2-86c6c58097b2596faf7760e43edd14ba4a6bc02b.tar.gz
bcfg2-86c6c58097b2596faf7760e43edd14ba4a6bc02b.tar.bz2
bcfg2-86c6c58097b2596faf7760e43edd14ba4a6bc02b.zip
Fix group problem caused by XInclude code
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2652 ce84e21b-d406-0410-9b95-82705330c041
-rw-r--r--src/lib/Server/Plugins/Metadata.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py
index d416b8c89..f28db386b 100644
--- a/src/lib/Server/Plugins/Metadata.py
+++ b/src/lib/Server/Plugins/Metadata.py
@@ -106,6 +106,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin):
grouptmp = {}
self.categories = {}
for group in xdata.findall('.//Group'):
+ if group.getparent().tag == 'Group':
+ continue
grouptmp[group.get('name')] = tuple([[item.get('name') for item in group.findall(spec)]
for spec in ['./Bundle', './Group']])
grouptmp[group.get('name')][1].append(group.get('name'))