mirror of
git://git.yoctoproject.org/poky
synced 2026-08-12 09:59:29 +00:00
oeqa/target/ssh: Replace suggogatepass with ignoring errors
We continued to see encoding problems with ssh commands run in oeqa. After much research the conclusion was we should use ignore the errors since some occasional bad locale encoding is better than the unicode decoding issues we were seeing which crashed large parts of tests. (From OE-Core rev: e4037c6911592700799d207ca8c3976afba18e25) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
130cad3803
commit
72ed2ca072
@ -207,7 +207,7 @@ def SSHCall(command, logger, timeout=None, **opts):
|
||||
logger.debug('time: %s, endtime: %s' % (time.time(), endtime))
|
||||
try:
|
||||
if select.select([process.stdout], [], [], 5)[0] != []:
|
||||
reader = codecs.getreader('utf-8')(process.stdout, 'surrogatepass')
|
||||
reader = codecs.getreader('utf-8')(process.stdout, 'ignore')
|
||||
data = reader.read(1024, 4096)
|
||||
if not data:
|
||||
process.stdout.close()
|
||||
@ -234,7 +234,7 @@ def SSHCall(command, logger, timeout=None, **opts):
|
||||
output += lastline
|
||||
|
||||
else:
|
||||
output = process.communicate()[0].decode("utf-8", errors='surrogatepass')
|
||||
output = process.communicate()[0].decode('utf-8', errors='ignore')
|
||||
logger.debug('Data from SSH call: %s' % output.rstrip())
|
||||
|
||||
options = {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user