From 37c0b9852b85a08adf0cbd7da1c0ccd017bcee42 Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Mon, 18 May 2015 15:06:11 -0700 Subject: bitbake: localhostbecontroller: Fix server search debug message When the output from the commands ran was redirected to "toaster_server.log" instead of the console, the debug message stating the port on which bitbake is running would no longer appear. This change makes looks at "toaster_server.log" for the port rather than the _shellcmd output. This makes the debug message useful again. (Bitbake rev: 9097bae469cb1e005092c11610d92e908b8f19f5) Signed-off-by: Randy Witt Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bitbake/lib') diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 1bd51437a6..95ba481974 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py @@ -122,10 +122,11 @@ class LocalhostBEController(BuildEnvironmentController): port = "-1" logger.debug("localhostbecontroller: starting builder \n%s\n" % cmd) cmdoutput = self._shellcmd(cmd) - for i in cmdoutput.split("\n"): - if i.startswith("Bitbake server address"): - port = i.split(" ")[-1] - logger.debug("localhostbecontroller: Found bitbake server port %s" % port) + with open(self.be.builddir + "/toaster_server.log", "r") as f: + for i in f.readlines(): + if i.startswith("Bitbake server address"): + port = i.split(" ")[-1] + logger.debug("localhostbecontroller: Found bitbake server port %s" % port) def _toaster_ui_started(filepath, filepos = 0): if not os.path.exists(filepath): -- cgit v1.2.3-54-g00ecf