From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 2 Mar 2013 00:04:40 +0000 (-0800)
Subject: package_rpm.bbclass: Trigger the regexp on exact keyword match
X-Git-Tag: 2015-4~3831
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f5bc3cfac9545c402b415695c4e0f98ad38fb2b0;p=openembedded-core.git

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

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---

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"