diff options
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 4b18cc6701..d0f69bf40f 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -101,23 +101,23 @@ package_generate_rpm_conf_common() { | |||
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | rpm_log_check() { | 103 | rpm_log_check() { |
| 104 | target="$1" | 104 | target="$1" |
| 105 | lf_path="$2" | 105 | lf_path="$2" |
| 106 | 106 | ||
| 107 | lf_txt="`cat $lf_path`" | 107 | lf_txt="`cat $lf_path`" |
| 108 | for keyword_die in "Cannot find package" "exit 1" ERR Fail | 108 | for keyword_die in "Cannot find package" "exit 1" ERR Fail |
| 109 | do | 109 | do |
| 110 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | 110 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 |
| 111 | then | 111 | then |
| 112 | echo "log_check: There were error messages in the logfile" | 112 | echo "log_check: There were error messages in the logfile" |
| 113 | echo -e "log_check: Matched keyword: [$keyword_die]\n" | 113 | echo -e "log_check: Matched keyword: [$keyword_die]\n" |
| 114 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" | 114 | echo "$lf_txt" | grep -v log_check | grep -C 5 -i "$keyword_die" |
| 115 | echo "" | 115 | echo "" |
| 116 | do_exit=1 | 116 | do_exit=1 |
| 117 | fi | 117 | fi |
| 118 | done | 118 | done |
| 119 | test "$do_exit" = 1 && exit 1 | 119 | test "$do_exit" = 1 && exit 1 |
| 120 | true | 120 | true |
| 121 | } | 121 | } |
| 122 | 122 | ||
| 123 | 123 | ||
