diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-01-19 10:40:56 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-01-22 21:58:04 -0800 |
| commit | dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6 (patch) | |
| tree | 07f558a5f04691cb1330cb46a4c3e6f651143c2d /bin/ebuild-helpers | |
| parent | dep_zapdeps: break more buildtime cycles (bug 705986) (diff) | |
| download | portage-dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6.tar.gz portage-dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6.tar.bz2 portage-dfeae52bdb90763b9144cbb6a82ffc3b8b49d0f6.zip | |
dosym: revert deprecated prefix compat (bug 615594)
According to PMS, dosym callers need to explicitly prefix the first
argument with ${EPREFIX} if that's desired.
https://bugs.gentoo.org/615594
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'bin/ebuild-helpers')
| -rwxr-xr-x | bin/ebuild-helpers/dosym | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym index d5a651bf5..abd4da4f0 100755 --- a/bin/ebuild-helpers/dosym +++ b/bin/ebuild-helpers/dosym @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 source "${PORTAGE_BIN_PATH}"/isolated-functions.sh || exit 1 @@ -20,16 +20,7 @@ fi destdir=${2%/*} [[ ! -d ${ED%/}/${destdir#/} ]] && dodir "${destdir}" -target="${1}" -# DEPRECATED HACK: when absolute, prefix with offset for Gentoo Prefix -# (but only if ${EPREFIX} is not there already) -# this will eventually be removed, #615594 -if [[ ${target:0:1} == "/" && ${target}/ != "${EPREFIX}"/* ]]; then - eqawarn "dosym: prepending EPREFIX to path implicitly. If this is desired," - eqawarn " please fix the ebuild to use \${EPREFIX} explicitly." - target="${EPREFIX}${target}" -fi -ln -snf "${target}" "${ED%/}/${2#/}" +ln -snf "${1}" "${ED%/}/${2#/}" ret=$? [[ $ret -ne 0 ]] && __helpers_die "${0##*/} failed" |