[oe-commits] Peter Seebach : rootfs.py: Make set -x not break rootfs creation
git at git.openembedded.org
git at git.openembedded.org
Sun Jun 28 08:46:36 UTC 2015
Module: openembedded-core.git
Branch: fido
Commit: a13185ba4a29fca319b4eb4a76fdbdfcfe767322
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a13185ba4a29fca319b4eb4a76fdbdfcfe767322
Author: Peter Seebach <peter.seebach at windriver.com>
Date: Thu May 21 15:36:35 2015 -0500
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/rootfs.py | 3 +++
1 file changed, 3 insertions(+)
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:
More information about the Openembedded-commits
mailing list