Patchwork [04/15] package_rpm.bbclass: Trigger the regexp on exact keyword match

login
register
mail settings
Submitter Khem Raj
Date Jan. 30, 2014, 4:12 a.m.
Message ID <a7d4efe50d36d63781ff7ae2be88eec56019ef76.1391054829.git.raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/66063/
State New
Headers show

Comments

Khem Raj - Jan. 30, 2014, 4:12 a.m.
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>
---
 meta/classes/package_rpm.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

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"