From ca6bf209b2a1c655fd5fa076ff0dc609ad066ca7 Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Mon, 24 Jan 2011 11:04:55 -0600 Subject: Metadata: Stop stripping comments from clients.xml (Resolves #929) --- src/lib/Server/Plugins/Metadata.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/lib/Server/Plugins/Metadata.py') diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index fb7455a4c..52ae10dff 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -285,7 +285,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, continue else: break - tree.write(client_tree) + tree.write(client_tree, pretty_print=True) fcntl.lockf(fd, fcntl.LOCK_UN) client_tree.close() @@ -307,7 +307,7 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, continue else: break - tree.write(client_tree) + tree.write(client_tree, pretty_print=True) fcntl.lockf(fd, fcntl.LOCK_UN) client_tree.close() @@ -500,14 +500,6 @@ class Metadata(Bcfg2.Server.Plugin.Plugin, raise MetadataRuntimeError # prep data 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 newcontents = lxml.etree.tostring(dataroot, pretty_print=True) fd = datafile.fileno() -- cgit v1.2.3-1-g7c22