From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 11 Mar 2010 23:27:54 +0000 (-0000)
Subject: Bug #309001 - Only trust tar exit status (ignore decompressor exit status)
X-Git-Tag: v2.2_rc68~719
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e74dddf02d96d4c81771944a18ec7cbb2490f556;p=portage.git

Bug #309001 - Only trust tar exit status (ignore decompressor exit status)
when unpacking tar files.

svn path=/main/trunk/; revision=15820
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 60c8f5e22..d3470498d 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -356,8 +356,7 @@ unpack() {
 
 		_unpack_tar() {
 			if [ "${y}" == "tar" ]; then
-				$1 -dc "$srcdir$x" | tar xof -
-				assert "$myfail"
+				$1 -dc "$srcdir$x" | tar xof - || die "$myfail"
 			else
 				$1 -dc "${srcdir}${x}" > ${x%.*} || die "$myfail"
 			fi
@@ -372,8 +371,7 @@ unpack() {
 				tar xozf "$srcdir$x" || die "$myfail"
 				;;
 			tbz|tbz2)
-				bzip2 -dc "$srcdir$x" | tar xof -
-				assert "$myfail"
+				bzip2 -dc "$srcdir$x" | tar xof - || die "$myfail"
 				;;
 			ZIP|zip|jar)
 				unzip -qo "${srcdir}${x}" || die "$myfail"