summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-08-17 11:25:40 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:18 +0100
commitbfa522b2b57a8a8c24a0ca519708ec4318e2d1f4 (patch)
tree6ac9cd6cac68d1bde5879dbefd33ea28fa7b103d /meta
parent650227eea3f36f18b6cfbfc23a30474cc07014e1 (diff)
downloadpoky-bfa522b2b57a8a8c24a0ca519708ec4318e2d1f4.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. (From OE-Core rev: 16d8d7fdda4ae7d108f5d50cde3f6104e231bd23) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_rpm.bbclass2
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 () {
340 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \ 340 -D "_dbpath ${target_rootfs}/install" -D "`cat ${confbase}.macro`" \
341 -D "__dbi_txn create nofsync private" \ 341 -D "__dbi_txn create nofsync private" \
342 -U --justdb --replacepkgs --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \ 342 -U --justdb --replacepkgs --noscripts --notriggers --noparentdirs --nolinktos --ignoresize \
343 $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" || true 343 $pkg_name >> "`dirname ${BB_LOGFILE}`/log.do_${task}_attemptonly.${PID}" 2>&1 || true
344 done 344 done
345 fi 345 fi
346 346