summaryrefslogtreecommitdiffstats
path: root/src/lib/Server/Plugins/SGenshi.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:43:28 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:43:28 -0400
commit14ff0892f13ad45c99043fd9c90b6b1b7829b268 (patch)
tree53f795b75c7e996c277381a3da20f3a52fce1df5 /src/lib/Server/Plugins/SGenshi.py
parentdfd79c78df9351c1c4c337f94881bba878c3c549 (diff)
downloadbcfg2-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/SGenshi.py')
-rw-r--r--src/lib/Server/Plugins/SGenshi.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Server/Plugins/SGenshi.py b/src/lib/Server/Plugins/SGenshi.py
index f6a98c141..ae2623d29 100644
--- a/src/lib/Server/Plugins/SGenshi.py
+++ b/src/lib/Server/Plugins/SGenshi.py
@@ -8,7 +8,7 @@ import logging
import copy
import sys
import os.path
-
+import Bcfg2.Server
import Bcfg2.Server.Plugin
import Bcfg2.Server.Plugins.TGenshi
@@ -29,7 +29,8 @@ class SGenshiTemplateFile(Bcfg2.Server.Plugins.TGenshi.TemplateFile,
try:
stream = self.template.generate(metadata=metadata).filter( \
Bcfg2.Server.Plugins.TGenshi.removecomment)
- data = lxml.etree.XML(stream.render('xml', strip_whitespace=False))
+ data = lxml.etree.XML(stream.render('xml', strip_whitespace=False),
+ parser=Bcfg2.Server.XMLParser)
bundlename = os.path.splitext(os.path.basename(self.name))[0]
bundle = lxml.etree.Element('Bundle', name=bundlename)
for item in self.Match(metadata, data):