From: Joshua Lock Date: Thu, 22 Jul 2010 15:19:56 +0000 (+0100) Subject: rootfs_ipk: error when dependencies cannot be satisfied X-Git-Tag: 2011-1~5139 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0d18597ae768b8d46df55c069a0e90f69a346898;p=openembedded-core.git rootfs_ipk: error when dependencies cannot be satisfied Per bpo#109 dependency failure during rootfs generation did not cause an error despite that it would cause errors later on in the process. This patch updates the key phrases searched for in the log checking function. Signed-off-by: Joshua Lock --- diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index fa0764baf7..be42192009 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" ERR Fail + for keyword_die in "Cannot find package" "exit 1" "Cannot satisfy the following dependencies" ERR Fail do if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 then