]> code.ossystems Code Review - openembedded-core.git/commitdiff
package_rpm.bbclass: Trigger the regexp on exact keyword match
authorKhem Raj <raj.khem@gmail.com>
Sat, 2 Mar 2013 00:04:40 +0000 (16:04 -0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 2 Feb 2014 22:34:31 +0000 (22:34 +0000)
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

index 2d193b7465da22c9ddc12966b4eb1515c0697e57..e9a6ac87709caf734c3fc3d1d5e25db21e76491a 100644 (file)
@@ -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"