From c86a0d290fe919140a95658741c522a22d7988b6 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Thu, 2 Jul 2015 15:38:33 +0100 Subject: bitbake: toaster: Fix build execution regression Make sure the error value is initialised and update the string match that we have to identify bitbake's current startup status. Patch contribution from Eduard Bartosh (Bitbake rev: 915ba08a8a3013e9787e564f2ffd8698c948f433) Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/toasterui.py | 1 + bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index 28fdd8200e..376ac59323 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -239,6 +239,7 @@ def main(server, eventHandler, params ): if isinstance(event, (bb.event.BuildCompleted, bb.command.CommandFailed)): + errorcode = 0 if (isinstance(event, bb.command.CommandFailed)): errors += 1 errorcode = 1 diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 3e16837be1..1d3d1ce12c 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -139,7 +139,7 @@ class LocalhostBEController(BuildEnvironmentController): with open(filepath, "r") as f: f.seek(filepos) for line in f: - if line.startswith("NOTE: ToasterUI waiting for events"): + if line.startswith("Bitbake server started on demand"): return True return False -- cgit v1.2.3-54-g00ecf