From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 18 Mar 2014 11:31:14 +0000 (+0000)
Subject: bitbake: runqueue: Ensure handler does not recurse
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e58089b9d708ba176594a758580cc52c23725a5b;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: runqueue: Ensure handler does not recurse

Failures on the autobuilder look like this handler is recursing. That
shouldn't be possible but it doesn't hurt to code as such.

(Bitbake rev: e39e85803cbe1ef9413a118868c19087c0546d01)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index e8dfb394cdc..b71e1d0fcb0 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -930,7 +930,7 @@ class RunQueue:
                     self.finish_runqueue(True)
             except OSError:
                 pid = False
-        if callable(self.oldsigchld):
+        if callable(self.oldsigchld) and self.oldsigchld != self.sigchild_exception:
             self.oldsigchld(*args, **kwargs)
 
     def start_worker(self):