diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2015-07-02 15:38:33 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-02 22:55:54 +0100 |
| commit | 915ba08a8a3013e9787e564f2ffd8698c948f433 (patch) | |
| tree | 445b9757bfd552f287028277489608a027f82911 | |
| parent | 4338ab03826df3353e1222f0bd825dfdd04dd933 (diff) | |
| download | bitbake-915ba08a8a3013e9787e564f2ffd8698c948f433.tar.gz | |
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
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/ui/toasterui.py | 1 | ||||
| -rw-r--r-- | lib/toaster/bldcontrol/localhostbecontroller.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/ui/toasterui.py b/lib/bb/ui/toasterui.py index 28fdd8200..376ac5932 100644 --- a/lib/bb/ui/toasterui.py +++ b/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/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index 3e16837be..1d3d1ce12 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/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 |