fix xml comments

(Logical change 1.376)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1588 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/Server/Plugins/Bundler.py b/src/lib/Server/Plugins/Bundler.py
index 86c52b9e2..4b357f121 100644
--- a/src/lib/Server/Plugins/Bundler.py
+++ b/src/lib/Server/Plugins/Bundler.py
@@ -3,7 +3,7 @@ __revision__ = '$Revision$'
 
 from copy import deepcopy
 from syslog import LOG_ERR, syslog
-from lxml.etree import Element, XML, XMLSyntaxError
+from lxml.etree import Element, XML, XMLSyntaxError, _Comment
 
 from Bcfg2.Server.Plugin import Plugin, SingleXMLFileBacked, XMLFileBacked, DirectoryBacked
 
@@ -50,11 +50,13 @@ class Bundle(XMLFileBacked):
         self.all = []
         self.systems = {}
         self.attributes = {}
-        for entry in xdata.getchildren():
+        for entry in [ent for ent in xdata.getchildren() if not isinstance(ent, _Comment)]:
             if entry.tag == 'System':
-                self.systems[entry.attrib['name']] = entry.getchildren()
+                self.systems[entry.attrib['name']] = [ent for ent in entry.getchildren() \
+                                                      if not isinstance(ent, _Comment)]
             elif entry.tag == 'Attribute':
-                self.attributes[entry.get('name')] = entry.getchildren()
+                self.attributes[entry.get('name')] = [ent for ent in entry.getchildren() \
+                                                      if not isinstance(ent, _Comment)]
             else:
                 self.all.append(entry)
         del self.data