From e019fb4c887fa95a678bd4b7dc9b915a062f7114 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Tue, 19 May 2015 15:38:56 -0400 Subject: [PATCH] Only conditionally delete fields from event If some events (for example, OEM events) are encountered, the deleted fields won't exist in the first place. Avoid KeyErrors by checking before deleting. Change-Id: I91ca73f4288c7b877589e766c8ce1ea1166e0d37 --- pyghmi/ipmi/events.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pyghmi/ipmi/events.py b/pyghmi/ipmi/events.py index 912807a5..47974237 100644 --- a/pyghmi/ipmi/events.py +++ b/pyghmi/ipmi/events.py @@ -454,8 +454,10 @@ class EventHandler(object): # is wholly left up to the OEM layer, using the OEM ID of the BMC event['oemdata'] = selentry[3:] self._ipmicmd._oem.process_event(event) - del event['event_type_byte'] - del event['event_data_bytes'] + if 'event_type_byte' in event: + del event['event_type_byte'] + if 'event_data_bytes' in event: + del event['event_data_bytes'] return event def _fetch_entries(self, ipmicmd, startat, targetlist, rsvid=0):