From: Zac Medico <zmedico@gentoo.org>
Date: Mon, 22 Oct 2007 20:33:08 +0000 (-0000)
Subject: Remove slashes that cause problems when unpacking files with
X-Git-Tag: v2.1.3.16~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3059b58c4afa8fc05b59b562c390c40b50437e4e;p=portage.git

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

svn path=/main/branches/2.1.2/; revision=8231
---

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 4e98b6474..c434c9ba2 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -481,20 +481,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