diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-25 14:36:33 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-06-25 14:36:33 -0400 |
commit | 94788714a2867ebc2fcc5b80ba8a0939dcb9aa48 (patch) | |
tree | 33517e12a58c85aac619a81a89b240927321c702 /src/lib/Bcfg2/Server/Plugins/Metadata.py | |
parent | e93478e013d1cda7f77771f622f5c99ac0199979 (diff) | |
download | bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.tar.gz bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.tar.bz2 bcfg2-94788714a2867ebc2fcc5b80ba8a0939dcb9aa48.zip |
unified [Single]XMLFileBacked, enabled xinclude pretty much everywhere
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Metadata.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index 50604f5cb..9786466bc 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -35,17 +35,16 @@ class MetadataRuntimeError(Exception): pass -class XMLMetadataConfig(Bcfg2.Server.Plugin.SingleXMLFileBacked): +class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): """Handles xml config files and all XInclude statements""" def __init__(self, metadata, watch_clients, basefile): - # we tell SingleXMLFileBacked _not_ to add a monitor for this + # we tell XMLFileBacked _not_ to add a monitor for this # file, because the main Metadata plugin has already added # one. then we immediately set should_monitor to the proper # value, so that XIinclude'd files get properly watched fpath = os.path.join(metadata.data, basefile) - Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self, fpath, - metadata.core.fam, - should_monitor=False) + Bcfg2.Server.Plugin.XMLFileBacked.__init__(self, fpath, + fam=metadata.core.fam) self.should_monitor = watch_clients self.metadata = metadata self.fam = metadata.core.fam |