Loop over disabled events, for single returns

This commit is contained in:
Ruud
2011-08-03 22:00:42 +02:00
parent a954d269f6
commit 5dd802bc31
+11 -4
View File
@@ -44,10 +44,17 @@ def fireEvent(name, *args, **kwargs):
if single and not merge:
results = None
if result[0][0] is True and result[0][1] is not None:
results = result[0][1]
elif result[0][1]:
errorHandler(result[0][1])
# Loop over results, stop when first not None result is found.
for r in result:
if r[0] is True and r[1] is not None:
results = r[1]
break
elif r[1]:
errorHandler(r[1])
else:
log.debug('Assume disabled plugin: %s' % r[2])
else:
results = []
for r in result: