diff options
| author |   Mark Hatle <mark.hatle@windriver.com> | 2012-08-17 11:25:40 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-08-17 17:48:23 +0100 |
| commit | 16d8d7fdda4ae7d108f5d50cde3f6104e231bd23 (patch) | |
| tree | 8b5155b60df580e414519d8d267dd32cdb15d0ef /meta/classes | |
| parent | 43600df0d4efc976a9451163dd334b4763937932 (diff) | |
| download | openembedded-core-16d8d7fdda4ae7d108f5d50cde3f6104e231bd23.tar.gz | |
package_rpm.bbclass: Fix attemptonly install failures
During an attemptonly install, if you try to install two packages that
conflict with each other, a message is generated:
error: Failed dependencies:
dropbear conflicts with openssh-6.0p1-r4.ppc603e
dropbear conflicts with openssh-sshd-6.0p1-r4.ppc603e
This is placed onto stderr (vs stdout), which was not being redirected.
This allowed the log-check code to find the magic key of "Failed" causing
the package installation process to fail. Instead the proper behavior is to
simply ignore the error and proceed with the install.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -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 b58ae85300..4b18cc6701 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -340,7 +340,7 @@ package_install_internal_rpm () { -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \ -D "__dbi_txn create nofsync private" \ -U --justdb --replacepkgs --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ - $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true + $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" 2>&1 || true done fi |