diff options
Diffstat (limited to 'meta/classes/package_ipk.bbclass')
-rw-r--r-- | meta/classes/package_ipk.bbclass | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index a297a1f9d4..e94586e6ca 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -172,23 +172,23 @@ package_install_internal_ipk() { | |||
172 | } | 172 | } |
173 | 173 | ||
174 | ipk_log_check() { | 174 | ipk_log_check() { |
175 | target="$1" | 175 | target="$1" |
176 | lf_path="$2" | 176 | lf_path="$2" |
177 | 177 | ||
178 | lf_txt="`cat $lf_path`" | 178 | lf_txt="`cat $lf_path`" |
179 | for keyword_die in "exit 1" "Collected errors" ERR Fail | 179 | for keyword_die in "exit 1" "Collected errors" ERR Fail |
180 | do | 180 | do |
181 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | 181 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 |
182 | then | 182 | then |
183 | echo "log_check: There were error messages in the logfile" | 183 | echo "log_check: There were error messages in the logfile" |
184 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | 184 | echo -e "log_check: Matched keyword: [$keyword_die]\n" |
185 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | 185 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" |
186 | echo "" | 186 | echo "" |
187 | do_exit=1 | 187 | do_exit=1 |
188 | fi | 188 | fi |
189 | done | 189 | done |
190 | test "$do_exit" = 1 && exit 1 | 190 | test "$do_exit" = 1 && exit 1 |
191 | true | 191 | true |
192 | } | 192 | } |
193 | 193 | ||
194 | # | 194 | # |