[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7385/8267] core/target/ssh.py: use reader to handle partial data
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 7385/8267] core/target/ssh.py: use reader to handle partial data
- Date: Sun, 17 Dec 2017 06:10:27 +0000 (UTC)
commit b261fca0dcacf6f8bdef1f8c5ff8ad1e0f6cd182
Author: Robert Yang <liezhi yang windriver com>
Date: Wed Aug 23 23:19:55 2017 -0700
core/target/ssh.py: use reader to handle partial data
This can avoid UnicodeDecodeError error.
(From OE-Core rev: baa78420d8d8e716935852c9c7b749af0161395a)
Signed-off-by: Robert Yang <liezhi yang windriver com>
Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
meta/lib/oeqa/core/target/ssh.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meta/lib/oeqa/core/target/ssh.py b/meta/lib/oeqa/core/target/ssh.py
index a2eafcd..927d659 100644
--- a/meta/lib/oeqa/core/target/ssh.py
+++ b/meta/lib/oeqa/core/target/ssh.py
@@ -6,6 +6,7 @@ import time
import select
import logging
import subprocess
+import codecs
from . import OETarget
@@ -206,12 +207,12 @@ def SSHCall(command, logger, timeout=None, **opts):
logger.debug('time: %s, endtime: %s' % (time.time(), endtime))
try:
if select.select([process.stdout], [], [], 5)[0] != []:
- data = os.read(process.stdout.fileno(), 1024)
+ reader = codecs.getreader('utf-8')(process.stdout)
+ data = reader.read(1024, 1024)
if not data:
process.stdout.close()
eof = True
else:
- data = data.decode("utf-8", errors='replace')
output += data
logger.debug('Partial data from SSH call: %s' % data)
endtime = time.time() + timeout
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]