[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1165/8267] classes/testsdk: print output correctly on failure



commit ff41cfb5086b429aeea720e380fbe8b930d107c0
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Fri Jun 24 00:07:02 2016 +1200

    classes/testsdk: print output correctly on failure
    
    With Python 3 we get a bytes object from the command output and not a
    string, which gives some ugly formatting for error messages unless you
    decode it first.
    
    (From OE-Core rev: 798bec6fe43116b51247284eb4e415337b2e8e04)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/testsdk.bbclass |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass
index f4dc2c3..18f7678 100644
--- a/meta/classes/testsdk.bbclass
+++ b/meta/classes/testsdk.bbclass
@@ -65,7 +65,7 @@ def testsdk_main(d):
     try:
         subprocess.check_output("cd %s; %s <<EOF\n./tc\nY\nEOF" % (sdktestdir, tcname), shell=True)
     except subprocess.CalledProcessError as e:
-        bb.fatal("Couldn't install the SDK:\n%s" % e.output)
+        bb.fatal("Couldn't install the SDK:\n%s" % e.output.decode("utf-8"))
 
     try:
         run_test_context(SDKTestContext, d, sdktestdir, tcname, pn)
@@ -116,7 +116,7 @@ def testsdkext_main(d):
     try:
         subprocess.check_output("%s -y -d %s/tc" % (tcname, testdir), shell=True)
     except subprocess.CalledProcessError as e:
-        bb.fatal("Couldn't install the SDK EXT:\n%s" % e.output)
+        bb.fatal("Couldn't install the SDK EXT:\n%s" % e.output.decode("utf-8"))
 
     try:
         bb.plain("Running SDK Compatibility tests ...")


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