[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1634/8267] oeqa/utils/commands.py: Command class improve validations/decoding in output



commit 1981ab0829911ac91983babd1fab71093999b621
Author: Aníbal Limón <anibal limon linux intel com>
Date:   Wed Jul 27 17:40:42 2016 -0500

    oeqa/utils/commands.py: Command class improve validations/decoding in output
    
    When run a command sometimes the output isn't provided so validate
    before trying to encode to utf-8, also some output like BIOS/EFI
    contains characters that can't be codified into utf-8 for this reason
    set errors='replace'.
    
    [YOCTO #10019]
    
    (From OE-Core rev: f2a04faf3c5d0a3cc562061b22e1c4873e1ca769)
    
    Signed-off-by: Aníbal Limón <anibal limon 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/commands.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oeqa/utils/commands.py b/meta/lib/oeqa/utils/commands.py
index 4f79d15..a8e184d 100644
--- a/meta/lib/oeqa/utils/commands.py
+++ b/meta/lib/oeqa/utils/commands.py
@@ -78,7 +78,10 @@ class Command(object):
                 self.process.kill()
                 self.thread.join()
 
-        self.output = self.output.decode("utf-8").rstrip()
+        if not self.output:
+            self.output = ""
+        else:
+            self.output = self.output.decode("utf-8", errors='replace').rstrip()
         self.status = self.process.poll()
 
         self.log.debug("Command '%s' returned %d as exit code." % (self.cmd, self.status))


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