XMLFileBacked: always watch xincludes

In Bcfg2 1.3, XInclude'd files only got FAM watches if the parent file
was monitoring itself, and it got a FAM object passed to it.  This led
to some ugly workarounds, and bugs -- you couldn't easily use XInclude
in Properties or Bundler, for instance, and have changes recognized.
Since FAM objects are now module-level, we can always monitor
XInclude'd files.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/Plugin/helpers.py b/src/lib/Bcfg2/Server/Plugin/helpers.py
index 38491b05d..7a3d887fe 100644
--- a/src/lib/Bcfg2/Server/Plugin/helpers.py
+++ b/src/lib/Bcfg2/Server/Plugin/helpers.py
@@ -597,17 +597,14 @@ class XMLFileBacked(FileBacked):
     Index.__doc__ = FileBacked.Index.__doc__
 
     def add_monitor(self, fpath):
-        """ Add a FAM monitor to a file that has been XIncluded.  This
-        is only done if the constructor got both a ``fam`` object and
-        ``should_monitor`` set to True.
+        """ Add a FAM monitor to a file that has been XIncluded.
 
         :param fpath: The full path to the file to monitor
         :type fpath: string
         :returns: None
         """
         self.extra_monitors.append(fpath)
-        if self.should_monitor:
-            self.fam.AddMonitor(fpath, self)
+        self.fam.AddMonitor(fpath, self)
 
     def __iter__(self):
         return iter(self.entries)