diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2004-12-03 19:44:47 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2004-12-03 19:44:47 +0000 |
commit | f0c48e4ca5b07100063f0c5754523280349d72d5 (patch) | |
tree | 4701f76393d0a481f01db03d43b6e12551fcb67c /src/lib/Server | |
parent | 86619962407990ad5bd0bfa38ac251af465d96f9 (diff) | |
download | bcfg2-f0c48e4ca5b07100063f0c5754523280349d72d5.tar.gz bcfg2-f0c48e4ca5b07100063f0c5754523280349d72d5.tar.bz2 bcfg2-f0c48e4ca5b07100063f0c5754523280349d72d5.zip |
fix base
(Logical change 1.157)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@701 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server')
-rw-r--r-- | src/lib/Server/Structures/Base.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Server/Structures/Base.py b/src/lib/Server/Structures/Base.py index 5b3ac8865..b2c6be92a 100644 --- a/src/lib/Server/Structures/Base.py +++ b/src/lib/Server/Structures/Base.py @@ -2,11 +2,12 @@ __revision__ = '$Revision$' from copy import deepcopy - +from syslog import syslog, LOG_ERR from Bcfg2.Server.Generator import SingleXMLFileBacked from Bcfg2.Server.Structure import Structure from elementtree.ElementTree import Element, XML +from xml.parsers.expat import ExpatError class BaseFile(SingleXMLFileBacked): '''The Base file contains unstructured/independent configuration elements''' @@ -14,7 +15,12 @@ class BaseFile(SingleXMLFileBacked): def Index(self): '''Store XML data in reasonable structures''' self.store = {'Class':{'all':[]}, 'Image':{'all':[]}, 'all':[]} - for entry in XML(self.data).getchildren(): + try: + xdata = XML(self.data) + except ExpatError: + syslog(LOG_ERR, "Failed to parse base.xml") + return + for entry in xdata.getchildren(): self.store[entry.tag][entry.get('name')] = {'all':[], 'Class':{}, 'Image':{}} if entry.tag in ['Image', 'Class']: for child in entry.getchildren(): |