diff mbox series

rootfs: improve postinst intercept logging

Message ID 20170905101127.4810-1-ross.burton@intel.com
State Accepted
Commit 87110e971c548d9d3eb7296ea6772d18e0226e53
Headers show
Series rootfs: improve postinst intercept logging | expand

Commit Message

Ross Burton Sept. 5, 2017, 10:11 a.m. UTC 
Ensure we capture stderr, always write the output to the log, and don't be so
emotional in the warning message.

Signed-off-by: Ross Burton <ross.burton@intel.com>

---
 meta/lib/oe/rootfs.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 96591f370e6..9d4727e76c1 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -302,10 +302,11 @@  class Rootfs(object, metaclass=ABCMeta):
             bb.note("> Executing %s intercept ..." % script)
 
             try:
-                subprocess.check_output(script_full)
+                output = subprocess.check_output(script_full, stderr=subprocess.STDOUT)
+                if output: bb.note(output.decode("utf-8"))
             except subprocess.CalledProcessError as e:
-                bb.warn("The postinstall intercept hook '%s' failed (exit code: %d)! See log for details! (Output: %s)" %
-                        (script, e.returncode, e.output))
+                bb.warn("The postinstall intercept hook '%s' failed, details in log.do_rootfs" % script)
+                bb.note("Exit code %d. Output:\n%s" % (e.returncode, e.output.decode("utf-8")))
 
                 with open(script_full) as intercept:
                     registered_pkgs = None