summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Plugins/Bundler.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:53:04 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-05-15 09:53:04 -0400
commit4df3945eeecb31e3234e894202868a373c95e3aa (patch)
treeff6f26f8ea84930e9f43de7ba618dd8495fcb12f /src/lib/Bcfg2/Server/Plugins/Bundler.py
parent5a4a6fc2a913d5609d3e69ae04fee55fa1c521e1 (diff)
parent00ee09dcea30e0afa6d22331d6e2eff624f928d3 (diff)
downloadbcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.tar.gz
bcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.tar.bz2
bcfg2-4df3945eeecb31e3234e894202868a373c95e3aa.zip
merged maint
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Bundler.py')
-rw-r--r--src/lib/Bcfg2/Server/Plugins/Bundler.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index ccb99481e..cbc452608 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -6,7 +6,7 @@ import os
import os.path
import re
import sys
-
+import Bcfg2.Server
import Bcfg2.Server.Plugin
try:
@@ -51,7 +51,8 @@ class Bundler(Bcfg2.Server.Plugin.Plugin,
raise Bcfg2.Server.Plugin.PluginInitError
def template_dispatch(self, name):
- bundle = lxml.etree.parse(name)
+ bundle = lxml.etree.parse(name,
+ parser=Bcfg2.Server.XMLParser)
nsmap = bundle.getroot().nsmap
if name.endswith('.xml'):
if have_genshi and \