summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-01 16:04:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:37:38 +0000
commit867b1eee25344d0b891dc539c6eb01f527165ae2 (patch)
treef73dbd918b19f2f3830311c9e533b39b3783557e /meta/classes/package_rpm.bbclass
parent962ea3dfcc0df3740511ae8a693dd26a85c13972 (diff)
downloadpoky-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>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass2
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() {
65 lf_txt="`cat $lf_path`" 65 lf_txt="`cat $lf_path`"
66 for keyword_die in "unpacking of archive failed" "Cannot find package" "exit 1" ERR Fail 66 for keyword_die in "unpacking of archive failed" "Cannot find package" "exit 1" ERR Fail
67 do 67 do
68 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 68 if (echo "$lf_txt" | grep -v log_check | grep "\<$keyword_die\>") >/dev/null 2>&1
69 then 69 then
70 echo "log_check: There were error messages in the logfile" 70 echo "log_check: There were error messages in the logfile"
71 printf "log_check: Matched keyword: [$keyword_die]\n\n" 71 printf "log_check: Matched keyword: [$keyword_die]\n\n"