XMLFileBacked: Monitor XIncludes whenever a FAM is available

This monitors XIncluded files even if should_monitor=False, since the
object monitoring the base file will not monitor XIncludes.  This
ensures that XIncluded files are properly monitored whenever possible,
particularly for Bundler and Properties.

This is a partial backport of 5b66845 -- as much of a backport as is
possible without a module-level FAM object.

1 files changed, 5 insertions, 4 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py
index eef176cca..fb327f7ef 100644
--- a/src/lib/Bcfg2/Server/Plugins/Bundler.py
+++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py
@@ -38,9 +38,9 @@ if HAS_GENSHI:
                              Bcfg2.Server.Plugin.StructFile):
         """ Representation of a Genshi-templated bundle XML file """
 
-        def __init__(self, name, specific, encoding):
+        def __init__(self, name, specific, encoding, fam=None):
             TemplateFile.__init__(self, name, specific, encoding)
-            Bcfg2.Server.Plugin.StructFile.__init__(self, name)
+            Bcfg2.Server.Plugin.StructFile.__init__(self, name, fam=fam)
             self.logger = logging.getLogger(name)
 
         def get_xml_value(self, metadata):
@@ -106,13 +106,14 @@ class Bundler(Bcfg2.Server.Plugin.Plugin,
              nsmap['py'] == 'http://genshi.edgewall.org/')):
             if HAS_GENSHI:
                 spec = Bcfg2.Server.Plugin.Specificity()
-                return BundleTemplateFile(name, spec, self.encoding)
+                return BundleTemplateFile(name, spec, self.encoding,
+                                          fam=self.core.fam)
             else:
                 raise Bcfg2.Server.Plugin.PluginExecutionError("Genshi not "
                                                                "available: %s"
                                                                % name)
         else:
-            return BundleFile(name, self.fam)
+            return BundleFile(name, fam=self.fam)
 
     def BuildStructures(self, metadata):
         """Build all structures for client (metadata)."""