[gnome-continuous-yocto/gnomeostree-3.28-rocko: 803/8267] lib/oe/terminal.py: decode bytes variable before rstrip/split



commit 8a6c198381ba238d7a2d29c02745d87c5ea30b66
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Thu Jun 9 07:53:06 2016 -0500

    lib/oe/terminal.py: decode bytes variable before rstrip/split
    
    On python 3, bytes variable types must be decoded if these are intended to be
    used as strings, otherwise we get the following error exception:
    
        TypeError: Type str doesn't support the buffer API
    
    (From OE-Core rev: b950539c911b7945d652b05616164828e711ac7f)
    
    Signed-off-by: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/terminal.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index dc25d14..7f4458e 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -246,7 +246,7 @@ def check_terminal_version(terminalName):
         newenv["LANG"] = "C"
         p = sub.Popen(['sh', '-c', cmdversion], stdout=sub.PIPE, stderr=sub.PIPE, env=newenv)
         out, err = p.communicate()
-        ver_info = out.rstrip().split('\n')
+        ver_info = out.decode().rstrip().split('\n')
     except OSError as exc:
         import errno
         if exc.errno == errno.ENOENT:


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