summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPeter Seebach <peter.seebach@windriver.com>2015-05-21 15:36:35 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-24 07:19:18 +0100
commit65c0027940c39c983d595e72b8aa9902570b4afc (patch)
tree22a3f995a3777e71532f342ca5830c994e9f4ebc /meta
parentc1eefc5a4bee25dcf9f8fbe57dc980e9fe352cf7 (diff)
downloadpoky-65c0027940c39c983d595e72b8aa9902570b4afc.tar.gz
rootfs.py: Make set -x not break rootfs creation
The rootfs logfile check errors out if it finds an "exit 1" in a log. But consider the shell idiom: if ! $command; then exit 1; fi and consider a postinstall script with a "set -x" for debugging purposes (to get log output in /var/log/postinstall.log.) Solution: Ignore lines prefixed with a +, because those show shell code even if a specific fragment won't be executed. (From OE-Core rev: f23f129dba66144abf8fe8450320e01fa4c02f5c) Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/lib/oe/rootfs.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index ce23b237dc..a9a6c85a2c 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -403,6 +403,9 @@ class RpmRootfs(Rootfs):
403 for line in log.read().split('\n'): 403 for line in log.read().split('\n'):
404 if 'log_check' in line: 404 if 'log_check' in line:
405 continue 405 continue
406 # sh -x may emit code which isn't actually executed
407 if line.startswith('+'):
408 continue
406 409
407 m = r.search(line) 410 m = r.search(line)
408 if m: 411 if m: