[oe-commits] Khem Raj : package_rpm.bbclass: Trigger the regexp on exact keyword match

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: b46838a1862121627ea72a118838b56709b04775
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b46838a1862121627ea72a118838b56709b04775

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Mar  1 16:04:40 2013 -0800

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 at gmail.com>

---

 meta/classes/package_rpm.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 2d193b7..e9a6ac8 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"