summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-07-02 15:38:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-02 22:56:39 +0100
commitc86a0d290fe919140a95658741c522a22d7988b6 (patch)
tree8d89c1e47b38619909ee150b405a0caaa15b8dd6 /bitbake
parent56066872ae7e5a39ef92c12651ee2895f8c9594f (diff)
downloadpoky-c86a0d290fe919140a95658741c522a22d7988b6.tar.gz
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 <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/toasterui.py1
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
2 files changed, 2 insertions, 1 deletions
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 ):
239 239
240 if isinstance(event, (bb.event.BuildCompleted, bb.command.CommandFailed)): 240 if isinstance(event, (bb.event.BuildCompleted, bb.command.CommandFailed)):
241 241
242 errorcode = 0
242 if (isinstance(event, bb.command.CommandFailed)): 243 if (isinstance(event, bb.command.CommandFailed)):
243 errors += 1 244 errors += 1
244 errorcode = 1 245 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):
139 with open(filepath, "r") as f: 139 with open(filepath, "r") as f:
140 f.seek(filepos) 140 f.seek(filepos)
141 for line in f: 141 for line in f:
142 if line.startswith("NOTE: ToasterUI waiting for events"): 142 if line.startswith("Bitbake server started on demand"):
143 return True 143 return True
144 return False 144 return False
145 145