xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-25 11:01:09 +00:00
Code Issues Projects Releases Wiki Activity

Provide better trace capture for AttributeErrors under ipmi

Browse Source 
The ipmi plugin would erroneously treat all AttributeErrors following from
'next()' as indicating the top level was not a generator/iterator.
This commit is contained in:
Jarrod Johnson 2014-04-30 13:07:31 -04:00
parent c514c2c121
commit 6069eceb23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/hardwaremanagement/ipmi.py
View File

@ -21,7 +21,6 @@ import eventlet.green.threading as threading
import eventlet.greenpool as greenpool
import eventlet.queue
import pyghmi.constants as pygconstants
import pyghmi.exceptions as pygexc
import pyghmi.ipmi.console as console
import pyghmi.ipmi.command as ipmicommand
import socket
@ -184,6 +183,10 @@ class IpmiIterator(object):
try:
retdata = self.currdata.next()
except AttributeError:
if hasattr(self.currdata, 'next'):
# the attribute error is not the immediate
# one, raise it to be caught as normal
raise
retdata = self.currdata
self.currdata = None
return retdata