diff options
| author | Yu Ke <ke.yu@intel.com> | 2010-07-23 17:18:05 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-30 14:50:30 +0100 |
| commit | 8658f478b7a75bf756ce7a7f6c3b3f19b1da9292 (patch) | |
| tree | 10661271d7dec22055599640827248426cbacf2d | |
| parent | 16877ce14b9c6b813267e9b1cbf904ccf7b86292 (diff) | |
| download | poky-8658f478b7a75bf756ce7a7f6c3b3f19b1da9292.tar.gz | |
rootfs_ipk.bbclass: add keyword "Collected errors" for log error check
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>
| -rw-r--r-- | meta/classes/rootfs_ipk.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass index be42192009..0bfa49194d 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" "Cannot satisfy the following dependencies" ERR Fail | 88 | for keyword_die in "exit 1" "Collected errors" 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 |