[gnome-continuous-yocto/gnomeostree-3.28-rocko: 620/8267] qemurunner: Use surrogateescape decoding
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 620/8267] qemurunner: Use surrogateescape decoding
- Date: Sat, 16 Dec 2017 20:40:56 +0000 (UTC)
commit 440c6816465c42dcf133d4bb48dcfbb9b5ad534b
Author: Richard Purdie <richard purdie linuxfoundation org>
Date: Wed Jun 1 13:27:25 2016 +0100
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 <richard purdie linuxfoundation org>
meta/lib/oeqa/utils/qemurunner.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py
index e408fbb..b8ac3f0 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):
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]