From 56ad9881e7472e695357a630dccb4f5a989209f2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 19 Sep 2011 11:14:20 -0400 Subject: made all XMLFileBacked plugins (e.g., GroupPatterns) support XInclude --- src/lib/Server/Plugin.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) (limited to 'src/lib/Server/Plugin.py') diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 36423e5cd..0038632e4 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -551,19 +551,40 @@ class XMLFileBacked(FileBacked): def __init__(self, filename): self.label = "dummy" self.entries = [] + self.extras = [] FileBacked.__init__(self, filename) def Index(self): """Build local data structures.""" try: - self.xdata = XML(self.data) - except XMLSyntaxError: - logger.error("Failed to parse %s" % (self.name)) - return + self.xdata = lxml.etree.XML(self.data, base_url=self.name) + except lxml.etree.XMLSyntaxError: + err = sys.exc_info()[1] + logger.error("Failed to parse %s" % err) + raise Bcfg2.Server.Plugin.PluginInitError + + included = [ent.get('href') + for ent in self.xdata.findall('./{http://www.w3.org/2001/XInclude}include')] + if included: + for name in included: + if name not in self.extras: + self.add_monitor(name) + try: + self.xdata.getroottree().xinclude() + except lxml.etree.XIncludeError: + err = sys.exc_info()[1] + logger.error("Failed to parse %s" % err) + self.entries = self.xdata.getchildren() if self.__identifier__ is not None: self.label = self.xdata.attrib[self.__identifier__] + def add_monitor(self, fname): + """Add a fam monitor for an included file""" + self.fam.AddMonitor(os.path.join(os.path.dirname(self.name), fname), + self) + self.extras.append(fname) + def __iter__(self): return iter(self.entries) -- cgit v1.2.3-1-g7c22