[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4994/8267] qemurunner.py: ignore decode errors



commit ac462e464f8bb879f54d9de14b8b2744fa8c6419
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Mon Mar 6 17:10:12 2017 +0200

    qemurunner.py: ignore decode errors
    
    qemu output can contain control characters. This cause qemurunner
    API to crash when decoding the output to utf-8:
    
    Traceback (most recent call last):
      File "/usr/lib64/python3.4/threading.py", line 911, in _bootstrap_inner
        self.run()
      File "meta/lib/oeqa/utils/qemurunner.py", line 472, in run
        threading.Thread.run(self)
      File "/usr/lib64/python3.4/threading.py", line 859, in run
        self._target(*self._args, **self._kwargs)
      File "meta/lib/oeqa/utils/qemurunner.py", line 465, in threadtarget
        self.eventloop()
      File "meta/lib/oeqa/utils/qemurunner.py", line 526, in eventloop
        self.logfunc(data)
      File "meta/lib/oeqa/utils/qemurunner.py", line 77, in log
        msg = msg.decode("utf-8")
    UnicodeDecodeError: 'utf-8' codec can't decode byte 0xda in position 0:
    unexpected end of data
    
    Added errors='ignore' to decode call to fix this.
    
    (From OE-Core rev: 4a46dd5190d97fdcb6297a0c1d8c824d425c4c51)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    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 19f0f92..59dc11d 100644
--- a/meta/lib/oeqa/utils/qemurunner.py
+++ b/meta/lib/oeqa/utils/qemurunner.py
@@ -74,7 +74,7 @@ class QemuRunner:
         if self.logfile:
             # It is needed to sanitize the data received from qemu
             # because is possible to have control characters
-            msg = msg.decode("utf-8")
+            msg = msg.decode("utf-8", errors='ignore')
             msg = re_control_char.sub('', msg)
             with codecs.open(self.logfile, "a", encoding="utf-8") as f:
                 f.write("%s" % msg)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]