From 440c6816465c42dcf133d4bb48dcfbb9b5ad534b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 Jun 2016 13:27:25 +0100 Subject: qemurunner: Use surrogateescape decoding Since the stream can contain invalid binary characters (e.g. from ppc's bootloader) use surrogateescape decoding to ensure we do process the character stream, else it can hang/timeout. (From OE-Core rev: 28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7) Signed-off-by: Richard Purdie --- meta/lib/oeqa/utils/qemurunner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib/oeqa/utils/qemurunner.py') diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index e408fbbf3a..b8ac3f0bb6 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -234,7 +234,7 @@ class QemuRunner: data = data + sock.recv(1024) if data: try: - data = data.decode("utf-8") + data = data.decode("utf-8", errors="surrogateescape") bootlog += data data = b'' if re.search(".* login:", bootlog): -- cgit v1.2.3-54-g00ecf