Skip to contentSkip to conversation

Fix broken attempt only installs with RPM

PATCH Applied Mark Hatle 2 participants 3 messages Aug 17, 2012

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Fix broken attempt only installs with RPM

The following changes since commit 99815eddd4e1eb5d939831704231537dd5a995ad:

classes/chrpath: improve chrpath failure handling (2012-08-17 15:25:01 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib mhatle/rpm
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm

Mark Hatle (1):
package_rpm.bbclass: Fix attemptonly install failures

 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/package_rpm.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/classes/package_rpm.bbclass +1 -1
index b58ae85..4b18cc6 100644
@@ -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
 
Signature · 1 line
1.7.3.4
Applied
#2 lore raw
In reply to Mark Hatle
Quoted 8 lines · Mark Hatle

The following changes since commit 99815eddd4e1eb5d939831704231537dd5a995ad:

   classes/chrpath: improve chrpath failure handling (2012-08-17 15:25:01 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib mhatle/rpm
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm

Quoted 6 lines

Mark Hatle (1):
package_rpm.bbclass: Fix attemptonly install failures

  meta/classes/package_rpm.bbclass |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

Merged into OE-Core

Thanks
Sau!