summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2005-11-30 22:37:07 +0000
committerNarayan Desai <desai@mcs.anl.gov>2005-11-30 22:37:07 +0000
commit523d9582c3fa2f685750a27c1125d6484dd45820 (patch)
tree2aa35b6efc3398a91ed241dffc6c839079073249 /src
parent276e381a86ae5fa6aa7df51efae98e8d958db0d0 (diff)
downloadbcfg2-523d9582c3fa2f685750a27c1125d6484dd45820.tar.gz
bcfg2-523d9582c3fa2f685750a27c1125d6484dd45820.tar.bz2
bcfg2-523d9582c3fa2f685750a27c1125d6484dd45820.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Plugin.py7
1 files changed, 4 insertions, 3 deletions
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]