[oe-commits] Khem Raj : package_rpm.bbclass:Make the regexp less greedy
git at git.openembedded.org
git at git.openembedded.org
Mon Aug 26 10:19:17 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 6e9444a0acc4a6e42f2e1bb8192e527647a7b9fc
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=6e9444a0acc4a6e42f2e1bb8192e527647a7b9fc
Author: Khem Raj <raj.khem at gmail.com>
Date: Fri Mar 1 16:04:40 2013 -0800
package_rpm.bbclass:Make the regexp less greedy
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>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/package_rpm.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b29d3ed..a9ec9b2 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -60,7 +60,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"
More information about the Openembedded-commits
mailing list