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/NagiosGen.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/NagiosGen.py')
| -rw-r--r-- | src/lib/Server/Plugins/NagiosGen.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/NagiosGen.py b/src/lib/Server/Plugins/NagiosGen.py index 8a76c130d..287e1b0d3 100644 --- a/src/lib/Server/Plugins/NagiosGen.py +++ b/src/lib/Server/Plugins/NagiosGen.py @@ -7,7 +7,7 @@ import glob import socket import logging import lxml.etree - +import Bcfg2.Server import Bcfg2.Server.Plugin LOGGER = logging.getLogger('Bcfg2.Plugins.NagiosGen') @@ -85,7 +85,8 @@ class NagiosGen(Bcfg2.Server.Plugin.Plugin, LOGGER.warn("Parsing deprecated NagiosGen/parents.xml. " "Update to the new-style config with " "nagiosgen-convert.py.") - parents = lxml.etree.parse(pfile) + parents = lxml.etree.parse(pfile, + parser=Bcfg2.Server.XMLParser) for el in parents.xpath("//Depend[@name='%s']" % metadata.hostname): if 'parent' in xtra: xtra['parent'] += "," + el.get("on") |