diff options
author | Tim Laszlo <tim.laszlo@gmail.com> | 2011-01-24 11:04:55 -0600 |
---|---|---|
committer | Tim Laszlo <tim.laszlo@gmail.com> | 2011-01-24 11:08:20 -0600 |
commit | 1b16c036f84b51ceb2caaf5aa04b2127743ce219 (patch) | |
tree | 3faac02ba5af3e9e13633f3e0c6462a60f773f4c | |
parent | 117f58f44d143539ca0b4f3678a7fcae1f3c6084 (diff) | |
download | bcfg2-1b16c036f84b51ceb2caaf5aa04b2127743ce219.tar.gz bcfg2-1b16c036f84b51ceb2caaf5aa04b2127743ce219.tar.bz2 bcfg2-1b16c036f84b51ceb2caaf5aa04b2127743ce219.zip |
Metadata: Stop stripping comments from clients.xml (Resolves #929)
(cherry picked from commit ca6bf209b2a1c655fd5fa076ff0dc609ad066ca7)
-rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 81fd3e173..8b7c12771 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() @@ -490,14 +490,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() |