summaryrefslogtreecommitdiffstats
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-22 13:36:03 +0100
commitf23f129dba66144abf8fe8450320e01fa4c02f5c (patch)
treebacc11e17b4050e5a5f4b61dadf630017df14fa6
parent7bbd34c0efd0f7d65edb7187abdde695e45f62e2 (diff)
downloadopenembedded-core-contrib-f23f129dba66144abf8fe8450320e01fa4c02f5c.tar.gz
openembedded-core-contrib-f23f129dba66144abf8fe8450320e01fa4c02f5c.tar.bz2
openembedded-core-contrib-f23f129dba66144abf8fe8450320e01fa4c02f5c.zip
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. Signed-off-by: Peter Seebach <peter.seebach@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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):
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: