diff options
author | Randy Witt <randy.e.witt@linux.intel.com> | 2015-05-18 15:06:11 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-19 11:58:45 +0100 |
commit | 37c0b9852b85a08adf0cbd7da1c0ccd017bcee42 (patch) | |
tree | 5829124e4d8b35f84f601a6b5a8270da35a60811 | |
parent | 3371a7bc96081f88b796209c631f5c80c8b45b27 (diff) | |
download | poky-37c0b9852b85a08adf0cbd7da1c0ccd017bcee42.tar.gz |
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 <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 9 |
1 files changed, 5 insertions, 4 deletions
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): | |||
122 | port = "-1" | 122 | port = "-1" |
123 | logger.debug("localhostbecontroller: starting builder \n%s\n" % cmd) | 123 | logger.debug("localhostbecontroller: starting builder \n%s\n" % cmd) |
124 | cmdoutput = self._shellcmd(cmd) | 124 | cmdoutput = self._shellcmd(cmd) |
125 | for i in cmdoutput.split("\n"): | 125 | with open(self.be.builddir + "/toaster_server.log", "r") as f: |
126 | if i.startswith("Bitbake server address"): | 126 | for i in f.readlines(): |
127 | port = i.split(" ")[-1] | 127 | if i.startswith("Bitbake server address"): |
128 | logger.debug("localhostbecontroller: Found bitbake server port %s" % port) | 128 | port = i.split(" ")[-1] |
129 | logger.debug("localhostbecontroller: Found bitbake server port %s" % port) | ||
129 | 130 | ||
130 | def _toaster_ui_started(filepath, filepos = 0): | 131 | def _toaster_ui_started(filepath, filepos = 0): |
131 | if not os.path.exists(filepath): | 132 | if not os.path.exists(filepath): |