diff options
| author | Peter Seebach <peter.seebach@windriver.com> | 2015-05-21 15:36:35 -0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:44:12 +0100 |
| commit | ab84c98f9f82d84fb7a60774e08d41013c8de8a9 (patch) | |
| tree | 07904353237437cf26d3250213432a414b1a922e /meta/lib | |
| parent | e82008724e0f350823c7b0e7b8e2c9f64ace406a (diff) | |
| download | ast2050-yocto-poky-ab84c98f9f82d84fb7a60774e08d41013c8de8a9.zip ast2050-yocto-poky-ab84c98f9f82d84fb7a60774e08d41013c8de8a9.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)
(From OE-Core rev: a13185ba4a29fca319b4eb4a76fdbdfcfe767322)
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/rootfs.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index ce23b23..a9a6c85 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: |
