[OE-core] [PATCH 04/20] package_rpm.bbclass:Make the regexp less greedy
Khem Raj
raj.khem at gmail.com
Tue Aug 27 17:15:03 UTC 2013
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>
---
meta/classes/package_rpm.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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"
--
1.8.3.4
More information about the Openembedded-core
mailing list