[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1591/8267] bitbake: lib/bb/utils: show subprocess output in stack traces

[Emmanuele Bassi <ebassi src gnome org>]

commit ea234239f41a94a4b13b68648d8dc611f793a441
Author: Ross Burton <ross burton intel com>
Date:   Mon Jul 18 17:22:55 2016 +0100

    bitbake: lib/bb/utils: show subprocess output in stack traces
    
    If better_exec() throws a subprocess.CalledProcessError then show the output to
    the user as it likely contains useful information for solving the problem.
    
    (Bitbake rev: 8a6424ed871c3cbacd21cae8bc801197f83d67a6)
    
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/utils.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py
index 995089a..ce52960 100644
--- a/bitbake/lib/bb/utils.py
+++ b/bitbake/lib/bb/utils.py
@@ -375,6 +375,12 @@ def _print_exception(t, value, tb, realfile, text, context):
             level = level + 1
 
         error.append("Exception: %s" % ''.join(exception))
+
+        # If the exception is from spwaning a task, let's be helpful and display
+        # the output (which hopefully includes stderr).
+        if isinstance(value, subprocess.CalledProcessError):
+            error.append("Subprocess output:")
+            error.append(value.output.decode("utf-8", errors="ignore"))
     finally:
         logger.error("\n".join(error))