From f2d1d3c9136bf5b2bee71fa2678281c989bec620 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Thu, 1 Dec 2005 21:00:12 +0000
Subject: 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
---
 src/lib/Server/Plugin.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

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']):
-- 
cgit v1.2.3-1-g7c22