diff options
| author | Mark Hatle <mark.hatle@windriver.com> | 2012-12-10 10:55:03 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-17 17:24:52 +0000 |
| commit | 8b671644e1fa5cb4e4d8b6b0dc26a4b08e7485b7 (patch) | |
| tree | e435e0a06fbbcbe59106636f4612e58ff12dff82 | |
| parent | 4a7151b97127b5cb0a6870dca0682b496ca5c566 (diff) | |
| download | poky-8b671644e1fa5cb4e4d8b6b0dc26a4b08e7485b7.tar.gz | |
package_rpm.bbclass: Add additional install error detection
There is a condition where the package will fail to install, but smart does
not capture the error. Add the error string to the scan list.
(From OE-Core rev: 230068110e1cda349f9bf3886d8d06ac46deea37)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index cb8e0f42e6..7af1d6c0cc 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass | |||
| @@ -57,7 +57,7 @@ rpm_log_check() { | |||
| 57 | lf_path="$2" | 57 | lf_path="$2" |
| 58 | 58 | ||
| 59 | lf_txt="`cat $lf_path`" | 59 | lf_txt="`cat $lf_path`" |
| 60 | for keyword_die in "Cannot find package" "exit 1" ERR Fail | 60 | for keyword_die in "unpacking of archive failed" "Cannot find package" "exit 1" ERR Fail |
| 61 | do | 61 | do |
| 62 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 | 62 | if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1 |
| 63 | then | 63 | then |