From 7fb86e1272b9521d6192606a16357c2245562524 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 29 Jun 2007 16:16:14 +0000 Subject: use xpath instead of lxml api (should relax the 1.2 requirement to 1.1) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3391 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Metadata.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index f4daf99b7..2ef9b1f59 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -137,9 +137,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin): self.groups = {} grouptmp = {} self.categories = {} - for group in xdata.findall('.//Group'): - if group.getparent().tag == 'Group': - continue + for group in xdata.xpath('//Groups/Group') \ + + xdata.xpath('Group'): 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')) -- cgit v1.2.3-1-g7c22