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>

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