summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/toasterui.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2014-10-13 17:10:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:39:51 +0000
commit2837b110ae8fd5ff0ca3ac5959cadb7d4a5ce6cc (patch)
treefca7aba2e90cbcb6f3b11a90bb00665850fa2460 /bitbake/lib/bb/ui/toasterui.py
parenta0660718e6599538dd65cadadbc04c6adc951b57 (diff)
downloadpoky-2837b110ae8fd5ff0ca3ac5959cadb7d4a5ce6cc.tar.gz
bitbake: toaster: change startup parameter passing to avoid race
We avoid a race between the setting the TOASTER_BRBE variable and reading the variable in toaster ui by supplying the variable at server startup time through the toaster.conf post-read file. Additional small changes are included, including marking the build request with the environment id of where the build took place. (Bitbake rev: 7c333350418c4140e6c988c5272940f8057d327d) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/toasterui.py')
-rw-r--r--bitbake/lib/bb/ui/toasterui.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py
index d81b8a989c..0c53843149 100644
--- a/bitbake/lib/bb/ui/toasterui.py
+++ b/bitbake/lib/bb/ui/toasterui.py
@@ -219,6 +219,7 @@ def main(server, eventHandler, params ):
219 if isinstance(event, (bb.command.CommandCompleted, 219 if isinstance(event, (bb.command.CommandCompleted,
220 bb.command.CommandFailed, 220 bb.command.CommandFailed,
221 bb.command.CommandExit)): 221 bb.command.CommandExit)):
222 errorcode = 0
222 if (isinstance(event, bb.command.CommandFailed)): 223 if (isinstance(event, bb.command.CommandFailed)):
223 event.levelno = format.ERROR 224 event.levelno = format.ERROR
224 event.msg = "Command Failed " + event.error 225 event.msg = "Command Failed " + event.error
@@ -226,10 +227,10 @@ def main(server, eventHandler, params ):
226 event.lineno = 0 227 event.lineno = 0
227 buildinfohelper.store_log_event(event) 228 buildinfohelper.store_log_event(event)
228 errors += 1 229 errors += 1
230 errorcode = 1
229 231
230 buildinfohelper.update_build_information(event, errors, warnings, taskfailures) 232 buildinfohelper.update_build_information(event, errors, warnings, taskfailures)
231 buildinfohelper.close() 233 buildinfohelper.close(errorcode)
232
233 234
234 # we start a new build info 235 # we start a new build info
235 if buildinfohelper.brbe is not None: 236 if buildinfohelper.brbe is not None: