summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorMikko Rapeli <mikko.rapeli@linaro.org>2023-02-09 10:09:29 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-24 16:41:46 +0000
commitde82d38730f3e9c43de2944b0777dc026c2285be (patch)
treef33934cd1cdf5b2406991b8c3350cced1b536de4 /meta/lib
parent638294ca486d0762b8501a21fd5a562313ac6cbe (diff)
downloadpoky-de82d38730f3e9c43de2944b0777dc026c2285be.tar.gz
oeqa ssh.py: move output prints to new line
The output from is garbled otherwise and it's not easy to remove debug output form real command output on target. (From OE-Core rev: 36b572fbc5c88b9aaf4e146ecdb00c8d4ea6ff70) Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> (cherry picked from commit 917a70cbc43ac1c70c477b220c4115735457ef04) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/core/target/ssh.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index f956a7744f..f1b9090bbf 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -240,7 +240,7 @@ def SSHCall(command, logger, timeout=None, **opts):
240 eof = True 240 eof = True
241 else: 241 else:
242 output += data 242 output += data
243 logger.debug('Partial data from SSH call: %s' % data) 243 logger.debug('Partial data from SSH call:\n%s' % data)
244 endtime = time.time() + timeout 244 endtime = time.time() + timeout
245 except InterruptedError: 245 except InterruptedError:
246 continue 246 continue
@@ -256,12 +256,12 @@ def SSHCall(command, logger, timeout=None, **opts):
256 endtime = time.time() - starttime 256 endtime = time.time() - starttime
257 lastline = ("\nProcess killed - no output for %d seconds. Total" 257 lastline = ("\nProcess killed - no output for %d seconds. Total"
258 " running time: %d seconds." % (timeout, endtime)) 258 " running time: %d seconds." % (timeout, endtime))
259 logger.debug('Received data from SSH call %s ' % lastline) 259 logger.debug('Received data from SSH call:\n%s ' % lastline)
260 output += lastline 260 output += lastline
261 261
262 else: 262 else:
263 output = process.communicate()[0].decode('utf-8', errors='ignore') 263 output = process.communicate()[0].decode('utf-8', errors='ignore')
264 logger.debug('Data from SSH call: %s' % output.rstrip()) 264 logger.debug('Data from SSH call:\n%s' % output.rstrip())
265 265
266 options = { 266 options = {
267 "stdout": subprocess.PIPE, 267 "stdout": subprocess.PIPE,