]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs_ipk: error when dependencies cannot be satisfied
authorJoshua Lock <josh@linux.intel.com>
Thu, 22 Jul 2010 15:19:56 +0000 (16:19 +0100)
committerJoshua Lock <josh@linux.intel.com>
Thu, 22 Jul 2010 16:04:39 +0000 (17:04 +0100)
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>
meta/classes/rootfs_ipk.bbclass

index fa0764baf7c2d2f4820443378f462a27d5cead27..be42192009bf514f80da281c3e0b2514a83eb5e0 100644 (file)
@@ -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