converted InfoXML objects from XMLSrc to StructFile

1 files changed, 2 insertions, 14 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py
index 3b6fc8fa0..886b3993b 100644
--- a/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py
+++ b/src/lib/Bcfg2/Server/Plugins/Cfg/CfgInfoXML.py
@@ -1,6 +1,6 @@
 """ Handle info.xml files """
 
-from Bcfg2.Server.Plugin import PluginExecutionError, InfoXML
+from Bcfg2.Server.Plugin import InfoXML
 from Bcfg2.Server.Plugins.Cfg import CfgInfo
 
 
@@ -17,21 +17,9 @@ class CfgInfoXML(CfgInfo):
     __init__.__doc__ = CfgInfo.__init__.__doc__
 
     def bind_info_to_entry(self, entry, metadata):
-        mdata = dict()
-        self.infoxml.pnode.Match(metadata, mdata, entry=entry)
-        if 'Info' not in mdata:
-            raise PluginExecutionError("Failed to set metadata for file %s" %
-                                       entry.get('name'))
-        self._set_info(entry, mdata['Info'][None])
+        self.infoxml.BindEntry(entry, metadata)
     bind_info_to_entry.__doc__ = CfgInfo.bind_info_to_entry.__doc__
 
     def handle_event(self, event):
         self.infoxml.HandleEvent()
     handle_event.__doc__ = CfgInfo.handle_event.__doc__
-
-    def _set_info(self, entry, info):
-        CfgInfo._set_info(self, entry, info)
-        if '__children__' in info:
-            for child in info['__children__']:
-                entry.append(child)
-    _set_info.__doc__ = CfgInfo._set_info.__doc__