From cb21a4d2696891bb290b53980664d5a1f8d73fe0 Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 5 Nov 2009 00:56:06 +0000 Subject: Metadata: fix lxml api use to work with older versions git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5525 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Metadata.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 659c5e3c3..105d73125 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -478,12 +478,16 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, fd = datafile.fileno() while self.locked(fd) == True: pass - for item in self.clientdata_original.getroot().iter(): + dataroot = self.clientdata_original.getroot() + if hasattr(dataroot, 'iter'): + items = dataroot.iter() + else: + items = dataroot.getchildren() + for item in items: # no items have text data of any sort item.tail = None item.text = None - datafile.write(lxml.etree.tostring(self.clientdata_original.getroot(), - pretty_print=True)) + datafile.write(lxml.etree.tostring(dataroot, pretty_print=True)) fcntl.lockf(fd, fcntl.LOCK_UN) datafile.close() -- cgit v1.2.3-1-g7c22