From 6f73e672d16eb94d3bcf7e8392400f567cde4b5d Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Fri, 16 Feb 2007 21:48:22 +0000 Subject: Handle non-elements in pkglists (Resolves Ticket #403) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2831 ce84e21b-d406-0410-9b95-82705330c041 --- src/lib/Server/Plugins/Pkgmgr.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/lib/Server/Plugins/Pkgmgr.py b/src/lib/Server/Plugins/Pkgmgr.py index 7dc7a1bd2..abf0f689b 100644 --- a/src/lib/Server/Plugins/Pkgmgr.py +++ b/src/lib/Server/Plugins/Pkgmgr.py @@ -17,8 +17,13 @@ class PNode(Bcfg2.Server.Plugin.INode): if not pdict.has_key('Package'): pdict['Package'] = [] for child in data.getchildren(): - for attr in [key for key in data.attrib.keys() if key != 'name' and not child.attrib.has_key(key)]: - child.set(attr, data.get(attr)) + for attr in [key for key in data.attrib.keys() \ + if key != 'name' and not child.attrib.has_key(key)]: + try: + child.set(attr, data.get(attr)) + except: + # don't fail on things like comments and other immutable elements + pass Bcfg2.Server.Plugin.INode.__init__(self, data, pdict, parent) if not self.contents.has_key('Package'): self.contents['Package'] = {} -- cgit v1.2.3-1-g7c22