diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2009-11-05 00:56:06 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2009-11-05 00:56:06 +0000 |
| commit | cb21a4d2696891bb290b53980664d5a1f8d73fe0 (patch) | |
| tree | b8f7b7aefeda6433c800e3251c3b350500f7ffd1 | |
| parent | 232aed6a4c276172d5253273d66264333cc79cec (diff) | |
| download | bcfg2-cb21a4d2696891bb290b53980664d5a1f8d73fe0.tar.gz bcfg2-cb21a4d2696891bb290b53980664d5a1f8d73fe0.tar.bz2 bcfg2-cb21a4d2696891bb290b53980664d5a1f8d73fe0.zip | |
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
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 10 |
1 files 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() |