summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-22 09:34:01 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-03-22 09:34:01 -0400
commitaa9c78201cdba651b5e8c8ebbbdb66f4153dbe72 (patch)
treef95c384de1c2c5951b030240a19dec39492190ec /src
parenta906ebbd96cf3a022b489cc2c6aa1136e3c35af2 (diff)
downloadbcfg2-aa9c78201cdba651b5e8c8ebbbdb66f4153dbe72.tar.gz
bcfg2-aa9c78201cdba651b5e8c8ebbbdb66f4153dbe72.tar.bz2
bcfg2-aa9c78201cdba651b5e8c8ebbbdb66f4153dbe72.zip
XMLFileBacked: fixed XInclude
Clear out "extras" when each event is handled to ensure that we start fresh. Failure to do so prevents the wildcard XInclude munging to work, so the first time an event is processed everything is fine; but when subsequent events are processed, _follow_xincludes() thinks that each xinclude tag has already been munged and only removes it.
Diffstat (limited to 'src')
-rw-r--r--src/lib/Bcfg2/Server/Plugin/helpers.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index c2252f956..0b81077a3 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -543,6 +543,7 @@ class XMLFileBacked(FileBacked):
def Index(self):
self.xdata = lxml.etree.XML(self.data, base_url=self.name,
parser=Bcfg2.Server.XMLParser)
+ self.extras = []
self._follow_xincludes()
if self.extras:
try: