diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2013-03-01 16:04:40 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-02 22:37:38 +0000 |
| commit | 867b1eee25344d0b891dc539c6eb01f527165ae2 (patch) | |
| tree | f73dbd918b19f2f3830311c9e533b39b3783557e | |
| parent | 962ea3dfcc0df3740511ae8a693dd26a85c13972 (diff) | |
| download | openembedded-core-contrib-867b1eee25344d0b891dc539c6eb01f527165ae2.tar.gz | |
package_rpm.bbclass: Trigger the regexp on exact keyword match
This causes issues when postinstalls have ERROR keywords
its interpreted as error and image build is cancelled
(From OE-Core rev: f5bc3cfac9545c402b415695c4e0f98ad38fb2b0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 2d193b7465..e9a6ac8770 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -65,7 +65,7 @@ rpm_log_check() { lf_txt="`cat $lf_path`" for keyword_die in "unpacking of archive failed" "Cannot find package" "exit 1" ERR Fail do - if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 + if (echo "$lf_txt" | grep -v log_check | grep "\<$keyword_die\>") >/dev/null 2>&1 then echo "log_check: There were error messages in the logfile" printf "log_check: Matched keyword: [$keyword_die]\n\n" |