Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/01/02 19:29:51+01:00 handhelds.org!CoreDump
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into handhelds.org:/home/mhentges/OpenEmbedded/bitbake/openembedded

2005/01/02 19:29:40+01:00 handhelds.org!CoreDump
rootfs_ipk: compensate for libgpg-err0

BKrev: 41d84007WaVATCNNgdjuFwFiwkniRQ

diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index 747f3ad..96e3321 100644 (file)
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -87,10 +87,10 @@ log_check() {
                then
                        lf_txt="`cat $lf_path`"
                        
-                       for keyword_die in "Cannot find package" "exit 1" err fail
+                       for keyword_die in "Cannot find package" "exit 1" ERR Fail
                        do                              
                                
-                               if (echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die") &>/dev/null
+                               if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null
                                then
                                        echo "log_check: There were error messages in the logfile"
                                        echo -e "log_check: Matched keyword: [$keyword_die]\n"