[bitbake-devel] [PATCH 5/5] bitbake: toaster: Fix build execution regression
Michael Wood
michael.g.wood at intel.com
Thu Jul 2 16:58:16 UTC 2015
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
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
bitbake/lib/bb/ui/toasterui.py | 1 +
bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index 28fdd82..376ac59 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 3e16837..1d3d1ce 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
--
2.1.4
More information about the bitbake-devel
mailing list