From: Marius Mauch <genone@gentoo.org>
Date: Sun, 21 Oct 2007 10:13:46 +0000 (-0000)
Subject: Remove slashes that cause problems when unpacking files with relative paths (bug... 
X-Git-Tag: v2.2_pre1~572
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=242b272e5728906de0ba7ecafc5ac1de588ab541;p=portage.git

Remove slashes that cause problems when unpacking files with relative paths (bug #196565)

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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index b298724e2..bad2cacb1 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -371,20 +371,20 @@ unpack() {
 				;;
 			7Z|7z)
 				local my_output
-				my_output="$(7z x -y "${srcdir}/${x}")"
+				my_output="$(7z x -y "${srcdir}${x}")"
 				if [ $? -ne 0 ]; then
 					echo "${my_output}" >&2
 					die "$myfail"
 				fi
 				;;
 			RAR|rar)
-				unrar x -idq -o+ "${srcdir}/${x}" || die "$myfail"
+				unrar x -idq -o+ "${srcdir}${x}" || die "$myfail"
 				;;
 			LHa|LHA|lha|lzh)
-				lha xfq "${srcdir}/${x}" || die "$myfail"
+				lha xfq "${srcdir}${x}" || die "$myfail"
 				;;
 			a|deb)
-				ar x "${srcdir}/${x}" || die "$myfail"
+				ar x "${srcdir}${x}" || die "$myfail"
 				;;
 			lzma)
 				if [ "${y}" == "tar" ]; then