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)

(From OE-Core rev: a13185ba4a29fca319b4eb4a76fdbdfcfe767322)

Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Peter Seebach
2015-05-21 15:36:35 -05:00
committed by Richard Purdie
parent e82008724e
commit ab84c98f9f

View File

@@ -403,6 +403,9 @@ class RpmRootfs(Rootfs):
for line in log.read().split('\n'):
if 'log_check' in line:
continue
# sh -x may emit code which isn't actually executed
if line.startswith('+'):
continue
m = r.search(line)
if m: