diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:43:28 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:43:28 -0400 |
| commit | 14ff0892f13ad45c99043fd9c90b6b1b7829b268 (patch) | |
| tree | 53f795b75c7e996c277381a3da20f3a52fce1df5 /src/lib/Server/Plugins/FileProbes.py | |
| parent | dfd79c78df9351c1c4c337f94881bba878c3c549 (diff) | |
| download | bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.gz bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.bz2 bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.zip | |
use XML parser that strips whitespace to avoid xml concatenation pretty_print issue
Diffstat (limited to 'src/lib/Server/Plugins/FileProbes.py')
| -rw-r--r-- | src/lib/Server/Plugins/FileProbes.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Server/Plugins/FileProbes.py b/src/lib/Server/Plugins/FileProbes.py index c58040b65..2332a1d40 100644 --- a/src/lib/Server/Plugins/FileProbes.py +++ b/src/lib/Server/Plugins/FileProbes.py @@ -11,6 +11,7 @@ import errno import binascii import lxml.etree import Bcfg2.Options +import Bcfg2.Server import Bcfg2.Server.Plugin probecode = """#!/usr/bin/env python @@ -104,7 +105,9 @@ class FileProbes(Bcfg2.Server.Plugin.Plugin, (data.get('name'), metadata.hostname)) else: try: - self.write_data(lxml.etree.XML(data.text), metadata) + self.write_data(lxml.etree.XML(data.text, + parser=Bcfg2.Server.XMLParser), + metadata) except lxml.etree.XMLSyntaxError: # if we didn't get XML back from the probe, assume # it's an error message |