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:45:16 +0100 |
| commit | 9097bae469cb1e005092c11610d92e908b8f19f5 (patch) | |
| tree | 9821b774b539f32a9488e665627512460094cba1 | |
| parent | 02763306662e15a4750395e5eab64ba98d1f9939 (diff) | |
| download | bitbake-9097bae469cb1e005092c11610d92e908b8f19f5.tar.gz | |
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.
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/toaster/bldcontrol/localhostbecontroller.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py index 1bd51437a..95ba48197 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/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): |