diff options
author | Marius Mauch <genone@gentoo.org> | 2007-10-21 10:13:46 +0000 |
---|---|---|
committer | Marius Mauch <genone@gentoo.org> | 2007-10-21 10:13:46 +0000 |
commit | 242b272e5728906de0ba7ecafc5ac1de588ab541 (patch) | |
tree | 41e92e39b708ddca2844005e538b043ea3a05e0c | |
parent | 1a8a6dc46d8c6b2bfdbc686736480109824e222a (diff) | |
download | portage-242b272e5728906de0ba7ecafc5ac1de588ab541.tar.gz portage-242b272e5728906de0ba7ecafc5ac1de588ab541.tar.bz2 portage-242b272e5728906de0ba7ecafc5ac1de588ab541.zip |
Remove slashes that cause problems when unpacking files with relative paths (bug #196565)
svn path=/main/trunk/; revision=8200
-rwxr-xr-x | bin/ebuild.sh | 8 |
1 files changed, 4 insertions, 4 deletions
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 |