diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2005-12-01 21:00:12 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2005-12-01 21:00:12 +0000 |
| commit | f2d1d3c9136bf5b2bee71fa2678281c989bec620 (patch) | |
| tree | 6e9a133f54ce925142f0946cb3625b73bc828521 /src/lib/Server/Plugin.py | |
| parent | 7b3c34c987805478456acfaaade82f6f69b99d99 (diff) | |
| download | bcfg2-f2d1d3c9136bf5b2bee71fa2678281c989bec620.tar.gz bcfg2-f2d1d3c9136bf5b2bee71fa2678281c989bec620.tar.bz2 bcfg2-f2d1d3c9136bf5b2bee71fa2678281c989bec620.zip | |
Handle fam event processing failures, and fix another case where xml comments cause problems
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1604 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib/Server/Plugin.py')
| -rw-r--r-- | src/lib/Server/Plugin.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 77187bb1d..d7c72a357 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, _Comment +from lxml.etree import XML, XMLSyntaxError, _Comment, tostring from os import stat from stat import ST_MTIME from syslog import syslog, LOG_ERR, LOG_INFO @@ -183,6 +183,10 @@ class ScopedXMLFile(SingleXMLFileBacked): def StoreRecord(self, metadata, entry): '''Store scoped record based on metadata''' + if isinstance(entry, _Comment): + return + elif not entry.attrib.has_key('name'): + syslog(LOG_ERR, "Got malformed record %s" % (tostring(entry))) if not self.store.has_key(entry.tag): self.store[entry.tag] = {} if not self.store[entry.tag].has_key(entry.attrib['name']): |