[oe-commits] [openembedded-core] 20/21: qemurunner: Use surrogateescape decoding

git at git.openembedded.org git at git.openembedded.org
Thu Jun 2 07:25:14 UTC 2016


rpurdie pushed a commit to branch master
in repository openembedded-core.

commit 28a0030430d4cfcaf5dfc3e71bda07cdbfbbf4a7
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: 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.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oeqa/utils/qemurunner.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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):

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list