summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-25 16:02:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-26 11:04:38 +0000
commitaac45679fb17c720f511a30261d34eb64e6a4c70 (patch)
treee71a20bbe1bb3e44ffa216c782e13f21a608646b
parent1cb4614f1d5e482b88ea372d1841a6c313a49941 (diff)
downloadpoky-aac45679fb17c720f511a30261d34eb64e6a4c70.tar.gz
bitbake/runqueue: Ensure finish_now() sets the runqueue state consistently
If we call finish_now(True), rq.state is not updated to match. This makes the behaviour of finish_now(False) and finish_now(True) consistent so both leave rq.state consistently. (Bitbake rev: 9079ae0ab74f9232b7e9853b2013b051d4fcf623) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 1959007bec..1c3187d462 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1060,6 +1060,13 @@ class RunQueueExecute:
1060 for pipe in self.build_pipes: 1060 for pipe in self.build_pipes:
1061 self.build_pipes[pipe].read() 1061 self.build_pipes[pipe].read()
1062 1062
1063 if len(self.failed_fnids) != 0:
1064 self.rq.state = runQueueFailed
1065 return
1066
1067 self.rq.state = runQueueComplete
1068 return
1069
1063 def finish(self): 1070 def finish(self):
1064 self.rq.state = runQueueCleanUp 1071 self.rq.state = runQueueCleanUp
1065 1072