From 8658f478b7a75bf756ce7a7f6c3b3f19b1da9292 Mon Sep 17 00:00:00 2001 From: Yu Ke Date: Fri, 23 Jul 2010 17:18:05 +0800 Subject: 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 --- meta/classes/rootfs_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/classes/rootfs_ipk.bbclass') diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index be4219200..0bfa49194 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 -- cgit v1.2.3