From: Yu Ke Date: Fri, 23 Jul 2010 09:18:05 +0000 (+0800) Subject: rootfs_ipk.bbclass: add keyword "Collected errors" for log error check X-Git-Tag: 2011-1~5039 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8658f478b7a75bf756ce7a7f6c3b3f19b1da9292;p=openembedded-core.git rootfs_ipk.bbclass: add keyword "Collected errors" for log error check Once ipk meet errors, the log will show "Collected errors:\n xxxx ". so keyword "Collected errors" is more general to catch errors. Signed-off-by: Yu Ke --- diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index be42192009..0bfa49194d 100644 --- a/meta/classes/rootfs_ipk.bbclass +++ b/meta/classes/rootfs_ipk.bbclass @@ -85,7 +85,7 @@ rootfs_ipk_log_check() { lf_path="$2" lf_txt="`cat $lf_path`" - for keyword_die in "Cannot find package" "exit 1" "Cannot satisfy the following dependencies" ERR Fail + for keyword_die in "exit 1" "Collected errors" ERR Fail do if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then