summaryrefslogtreecommitdiffstats
path: root/meta/classes/rootfs_rpm.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:51:24 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-11-16 10:51:24 +0000
commit01f75c1b48e1a087263427488245c0c79a2f87e3 (patch)
treefe51a461c32f7be31bafa31e8ccdc1d65ae25396 /meta/classes/rootfs_rpm.bbclass
parenta59f67fdb9077c84f80577aeab5b4cce37539d0d (diff)
downloadpoky-01f75c1b48e1a087263427488245c0c79a2f87e3.tar.gz
rootfs_rpm/icecc: Sync whitespace with OE.dev
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/classes/rootfs_rpm.bbclass')
-rw-r--r--meta/classes/rootfs_rpm.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/rootfs_rpm.bbclass b/meta/classes/rootfs_rpm.bbclass
index dd0257625f..105a1d78a1 100644
--- a/meta/classes/rootfs_rpm.bbclass
+++ b/meta/classes/rootfs_rpm.bbclass
@@ -184,7 +184,7 @@ EOF
184 # remove no longer used yum.conf 184 # remove no longer used yum.conf
185 rm -f ${IMAGE_ROOTFS}/etc/yum.conf 185 rm -f ${IMAGE_ROOTFS}/etc/yum.conf
186 186
187 log_check rootfs 187 log_check rootfs
188} 188}
189 189
190rootfs_rpm_log_check() { 190rootfs_rpm_log_check() {
@@ -193,14 +193,14 @@ rootfs_rpm_log_check() {
193 193
194 lf_txt="`cat $lf_path`" 194 lf_txt="`cat $lf_path`"
195 for keyword_die in "Cannot find package" "exit 1" ERR Fail 195 for keyword_die in "Cannot find package" "exit 1" ERR Fail
196 do 196 do
197 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 197 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
198 then 198 then
199 echo "log_check: There were error messages in the logfile" 199 echo "log_check: There were error messages in the logfile"
200 echo -e "log_check: Matched keyword: [$keyword_die]\n" 200 echo -e "log_check: Matched keyword: [$keyword_die]\n"
201 echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" 201 echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die"
202 echo "" 202 echo ""
203 do_exit=1 203 do_exit=1
204 fi 204 fi
205 done 205 done
206 test "$do_exit" = 1 && exit 1 206 test "$do_exit" = 1 && exit 1