diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-03-11 23:27:54 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-03-11 23:27:54 +0000 |
| commit | e74dddf02d96d4c81771944a18ec7cbb2490f556 (patch) | |
| tree | 7337d1c43ba8f6218cd6ac3f7cb0db2ac27c030b /bin/ebuild.sh | |
| parent | 63ab485cd530dcdaf7472dfd5b69a44dae1ebd82 (diff) | |
| download | portage-e74dddf02d96d4c81771944a18ec7cbb2490f556.tar.gz portage-e74dddf02d96d4c81771944a18ec7cbb2490f556.tar.bz2 portage-e74dddf02d96d4c81771944a18ec7cbb2490f556.zip | |
Bug #309001 - Only trust tar exit status (ignore decompressor exit status)
when unpacking tar files.
svn path=/main/trunk/; revision=15820
Diffstat (limited to 'bin/ebuild.sh')
| -rwxr-xr-x | bin/ebuild.sh | 6 |
1 files changed, 2 insertions, 4 deletions
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" |