From dfdb2eb33e7b899224f011cf6fad50d529a65183 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 25 Jul 2012 18:43:53 +0000 Subject: bitbake: runqueue.py: Gracefully exit if an exception occurs in the runqueue execution code There was a bug where an exception in the runqueue code would cause an infinite loop of debug messages. The exception would get reported but would loop since runqueue was still registered as an idle handler. This patch adds an exception handler to ensure in the case of errors, the system more gracefully shuts down and doesn't loop. (Bitbake rev: 99467c7e387f6e71358b40b8afae450d72cd68e0) Signed-off-by: Richard Purdie --- bitbake/lib/bb/runqueue.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 306ae79330..2925741336 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -862,7 +862,7 @@ class RunQueue: cache[task] = iscurrent return iscurrent - def execute_runqueue(self): + def _execute_runqueue(self): """ Run the tasks in a queue prepared by rqdata.prepare() Upon failure, optionally try to recover the build using any alternate providers @@ -926,6 +926,14 @@ class RunQueue: # Loop return retval + def execute_runqueue(self): + try: + return self._execute_runqueue() + except: + logger.error("An uncaught exception occured in runqueue, please see the failure below:") + self.state = runQueueComplete + raise + def finish_runqueue(self, now = False): if not self.rqexe: return -- cgit v1.2.3-54-g00ecf