From 523d9582c3fa2f685750a27c1125d6484dd45820 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Wed, 30 Nov 2005 22:37:07 +0000
Subject: fix xml comment handling

(Logical change 1.376)


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1584 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Server/Plugin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/lib/Server/Plugin.py')

diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py
index 6a4d4b550..77187bb1d 100644
--- a/src/lib/Server/Plugin.py
+++ b/src/lib/Server/Plugin.py
@@ -1,7 +1,7 @@
 '''This module provides the baseclass for Bcfg2 Server Plugins'''
 __revision__ = '$Revision:$'
 
-from lxml.etree import XML, XMLSyntaxError
+from lxml.etree import XML, XMLSyntaxError, _Comment
 from os import stat
 from stat import ST_MTIME
 from syslog import syslog, LOG_ERR, LOG_INFO
@@ -198,12 +198,13 @@ class ScopedXMLFile(SingleXMLFileBacked):
             syslog(LOG_ERR, msg)
             return
         self.store = {}
-        for entry in xdata.getchildren():
+        for entry in [ent for ent in  xdata.getchildren() if not isinstance(ent, _Comment)]:
             if entry.tag not in self.__containers__:
                 self.StoreRecord(('Global','all'), entry)
             else:
                 name = (entry.tag, entry.get('name'))
-                [self.StoreRecord(name, child) for child in entry.getchildren()]
+                [self.StoreRecord(name, child)
+                 for child in entry.getchildren() if not isinstance(entry, _Comment)]
         # now to build the __provides__ table
         for key in self.__provides__.keys():
             del self.__provides__[key]
-- 
cgit v1.2.3-1-g7c22