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>

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b58ae853006314be6301f9294c6ea2f8c5dc136c..4b18cc6701d6383f5d8b0fa892fc4761e3fa2066 100644 (file)
--- 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