summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xbin/ebuild.sh6
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b6d196dd1..21141fc12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,10 @@
2. /var/cache/edb/world is now /var/lib/portage/world.
3. /etc/portage/profile/virtuals is _USER_ configs only.
+ 08 Sep 2005; Brian Harring <ferringb@gentoo.org> bin/ebuild.sh: Fixed
+ unpack so that it actually works now. ${tarvars} placement was a bit
+ wrong, which is odd considering it shouldn't have changed.
+
08 Sep 2005; Jason Stubbs <jstubbs@gentoo.org> bin/emerge: Only warn on
removal of system virtuals if there is only one satisfying package.
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index c8288a8dd..8cba9030c 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -365,10 +365,10 @@ unpack() {
myfail="failure unpacking ${x}"
case "${x##*.}" in
tar)
- tar ${tarvars} xf "${srcdir}${x}" || die "$myfail"
+ tar xf "${srcdir}${x}" ${tarvars} || die "$myfail"
;;
tgz)
- tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail"
+ tar xzf "${srcdir}${x}" ${tarvars} || die "$myfail"
;;
tbz2)
bzip2 -dc "${srcdir}${x}" | tar xf - ${tarvars}
@@ -379,7 +379,7 @@ unpack() {
;;
gz|Z|z)
if [ "${y}" == "tar" ]; then
- tar ${tarvars} xzf "${srcdir}${x}" || die "$myfail"
+ tar zxf "${srcdir}${x}" ${tarvars} || die "$myfail"
else
gzip -dc "${srcdir}${x}" > ${x%.*} || die "$myfail"
fi