diff options
| author | Michael Fenn <fennm@deshawresearch.com> | 2013-10-10 14:13:26 -0400 |
|---|---|---|
| committer | Michael Fenn <fennm@deshawresearch.com> | 2013-10-10 14:13:26 -0400 |
| commit | 9871be0932869f35f33d3da22dae8db474e31cdd (patch) | |
| tree | c14632278e11aabfbf6e213bfd8e951e78933afd /src/lib/Bcfg2/Server/Plugins/Metadata.py | |
| parent | f813f86f8ac2bc7b55f4eb6a0d936f1ce4f68ba7 (diff) | |
| parent | 3a5eec174af0b9907b29fdfd3eb1e4fd7677beeb (diff) | |
| download | bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.tar.gz bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.tar.bz2 bcfg2-9871be0932869f35f33d3da22dae8db474e31cdd.zip | |
Merge remote-tracking branch 'upstream/maint' into reporting-thread-each-data-import
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Metadata.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Metadata.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Metadata.py b/src/lib/Bcfg2/Server/Plugins/Metadata.py index d47fd644b..047dd4f4e 100644 --- a/src/lib/Bcfg2/Server/Plugins/Metadata.py +++ b/src/lib/Bcfg2/Server/Plugins/Metadata.py @@ -16,7 +16,9 @@ import Bcfg2.Server.Lint import Bcfg2.Server.Plugin import Bcfg2.Server.FileMonitor from Bcfg2.Utils import locked -from Bcfg2.Compat import MutableMapping, all, wraps # pylint: disable=W0622 +# pylint: disable=W0622 +from Bcfg2.Compat import MutableMapping, all, any, wraps +# pylint: enable=W0622 from Bcfg2.version import Bcfg2VersionInfo try: @@ -219,6 +221,7 @@ class XMLMetadataConfig(Bcfg2.Server.Plugin.XMLFileBacked): sys.exc_info()[1]) self.logger.error(msg) raise Bcfg2.Server.Plugin.MetadataRuntimeError(msg) + self.load_xml() def find_xml_for_xpath(self, xpath): """Find and load xml file containing the xpath query""" |