]> code.ossystems Code Review - openembedded-core.git/commitdiff
rootfs_ipk.bbclass: add keyword "Collected errors" for log error check
authorYu Ke <ke.yu@intel.com>
Fri, 23 Jul 2010 09:18:05 +0000 (17:18 +0800)
committerRichard Purdie <rpurdie@linux.intel.com>
Fri, 30 Jul 2010 13:50:30 +0000 (14:50 +0100)
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 <ke.yu@intel.com>
meta/classes/rootfs_ipk.bbclass

index be42192009bf514f80da281c3e0b2514a83eb5e0..0bfa49194dc5a59fca7ce766a3b0f05b272e4116 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" "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