From 67bfb37475d64a931c32b984de011480dcd7c79d Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 2 Aug 2012 20:40:36 +0000
Subject: bitbake: runqueue.py: Clean up runqueue exception catching in the
 normal task failure case

(Bitbake rev: a0bc58031d4eb31f8587171e870ecad059af5098)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 bitbake/lib/bb/runqueue.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bitbake')

diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index d3a1d2d4f7..bc2eb8772e 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -927,8 +927,11 @@ class RunQueue:
         return retval
 
     def execute_runqueue(self):
+        # Catch unexpected exceptions and ensure we exit when an error occurs, not loop.
         try:
             return self._execute_runqueue()
+        except bb.runqueue.TaskFailure:
+            raise
         except:
             logger.error("An uncaught exception occured in runqueue, please see the failure below:")
             self.state = runQueueComplete
-- 
cgit v1.2.3-54-g00ecf