summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorChris Larson <clarson@mvista.com>2009-06-16 12:35:40 -0700
committerChris Larson <clarson@mvista.com>2009-06-17 11:48:31 -0700
commitd18b7848a50b94e3f0de4d4b90c05b224a5622c2 (patch)
tree8b1ec96162db5b6a5bcaaba8d7cf8bf6f9479334 /classes
parentda7c60d75e6cfdaa3e9c14b6ab52ae7262d37b3c (diff)
rootfs_ipk.bbclass: add log_check for "Cannot satisfy the following dependencies".
Fixes a bug pointed out where a missing rdepends of a package installed into an image wasn't resulting in a failure in the do_rootfs task. Signed-off-by: Chris Larson <clarson@mvista.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/rootfs_ipk.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/rootfs_ipk.bbclass b/classes/rootfs_ipk.bbclass
index f554e06dfa..99a8ed22c2 100644
--- a/classes/rootfs_ipk.bbclass
+++ b/classes/rootfs_ipk.bbclass
@@ -109,7 +109,8 @@ 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" "Cannot satisfy the following dependencies" \
+ "exit 1" ERR Fail
do
if (echo "$lf_txt" | grep -v log_check | grep -w "$keyword_die") >/dev/null 2>&1
then