From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from 93-97-173-237.zone5.bethere.co.uk ([93.97.173.237] helo=tim.rpsys.net) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1S1KD8-0008Ar-E3 for bitbake-devel@lists.openembedded.org; Sat, 25 Feb 2012 17:11:03 +0100 Received: from localhost (localhost [127.0.0.1]) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q1PG2bGr021592 for ; Sat, 25 Feb 2012 16:02:37 GMT Received: from tim.rpsys.net ([127.0.0.1]) by localhost (tim.rpsys.net [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 20924-05 for ; Sat, 25 Feb 2012 16:02:33 +0000 (GMT) Received: from [192.168.3.10] ([192.168.3.10]) (authenticated bits=0) by tim.rpsys.net (8.13.6/8.13.8) with ESMTP id q1PG2RbK021586 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 25 Feb 2012 16:02:29 GMT Message-ID: <1330185749.13788.44.camel@ted> From: Richard Purdie To: bitbake-devel Date: Sat, 25 Feb 2012 16:02:29 +0000 X-Mailer: Evolution 3.2.2- Mime-Version: 1.0 X-Virus-Scanned: amavisd-new at rpsys.net Subject: [PATCH] bitbake/runqueue: Ensure finish_now() sets the runqueue state consistently X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Feb 2012 16:11:03 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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. Signed-off-by: Richard Purdie diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index c24841f..26a0f85 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py @@ -1060,6 +1060,13 @@ class RunQueueExecute: for pipe in self.build_pipes: self.build_pipes[pipe].read() + if len(self.failed_fnids) != 0: + self.rq.state = runQueueFailed + return + + self.rq.state = runQueueComplete + return + def finish(self): self.rq.state = runQueueCleanUp