summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-07-22 16:19:56 +0100
committerJoshua Lock <josh@linux.intel.com>2010-07-22 17:04:39 +0100
commit0d18597ae768b8d46df55c069a0e90f69a346898 (patch)
tree24bea250ffefe96356ca675d36dbb10595034b3d
parentc017d0eeb98913d6041566d64df31cda637e2d5f (diff)
downloadpoky-0d18597ae768b8d46df55c069a0e90f69a346898.tar.gz
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 <josh@linux.intel.com>
-rw-r--r--meta/classes/rootfs_ipk.bbclass2
1 files changed, 1 insertions, 1 deletions
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() {
85 lf_path="$2" 85 lf_path="$2"
86 86
87 lf_txt="`cat $lf_path`" 87 lf_txt="`cat $lf_path`"
88 for keyword_die in "Cannot find package" "exit 1" ERR Fail 88 for keyword_die in "Cannot find package" "exit 1" "Cannot satisfy the following dependencies" ERR Fail
89 do 89 do
90 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 90 if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
91 then 91 then