summaryrefslogtreecommitdiff
path: root/meta/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-03-01 16:04:40 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-02 22:34:31 +0000
commitf5bc3cfac9545c402b415695c4e0f98ad38fb2b0 (patch)
tree785bf9bbad8fc7345012b312ba23a28dea3f3f3b /meta/classes/package_rpm.bbclass
parentead30aa5e3046f450ee688e14f6d5268d9ed0bd8 (diff)
downloadopenembedded-core-f5bc3cfac9545c402b415695c4e0f98ad38fb2b0.tar.gz
openembedded-core-f5bc3cfac9545c402b415695c4e0f98ad38fb2b0.tar.bz2
openembedded-core-f5bc3cfac9545c402b415695c4e0f98ad38fb2b0.zip
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>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
-rw-r--r--meta/classes/package_rpm.bbclass2
1 files changed, 1 insertions, 1 deletions
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"