From bfa522b2b57a8a8c24a0ca519708ec4318e2d1f4 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 17 Aug 2012 11:25:40 -0500 Subject: 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. (From OE-Core rev: 16d8d7fdda4ae7d108f5d50cde3f6104e231bd23) Signed-off-by: Mark Hatle Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3-54-g00ecf