From 990289511b7dc56580f2cecdda75fa14f436966d Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 2 Dec 2015 10:02:49 -0800 Subject: bitbake: toaster: do not terminate bb server Toaster needs bb server to be running all the time due to merged analysis and managed modes. Server gets restarted before every build triggered by UI, but it shouldn't be terminated as it will influence command line builds. [YOCTO #8279] (Bitbake rev: e69c87c7842e796ffcd7193ecde22c8f688498f5) Signed-off-by: Ed Bartosh Signed-off-by: brian avery Signed-off-by: Richard Purdie --- bitbake/lib/bb/ui/toasterui.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/bitbake/lib/bb/ui/toasterui.py b/bitbake/lib/bb/ui/toasterui.py index 3d261503ea..c5bf715ea5 100644 --- a/bitbake/lib/bb/ui/toasterui.py +++ b/bitbake/lib/bb/ui/toasterui.py @@ -320,15 +320,11 @@ def main(server, eventHandler, params): logger.info("ToasterUI build done 1, brbe: %s", buildinfohelper.brbe ) # we start a new build info - if buildinfohelper.brbe is not None: - logger.debug("ToasterUI under BuildEnvironment management - exiting after the build") - server.terminateServer() - else: - logger.debug("ToasterUI prepared for new build") - errors = 0 - warnings = 0 - taskfailures = [] - buildinfohelper = BuildInfoHelper(server, build_history_enabled) + logger.debug("ToasterUI prepared for new build") + errors = 0 + warnings = 0 + taskfailures = [] + buildinfohelper = BuildInfoHelper(server, build_history_enabled) logger.info("ToasterUI build done 2") continue -- cgit v1.2.3-54-g00ecf