[PATCH] dosym: revert deprecated prefix compat (bug 615594)

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] dosym: revert deprecated prefix compat (bug 615594)

Zac Medico-2
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 <[hidden email]>
---
 bin/ebuild-helpers/dosym | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym
index d5a651bf5..e869bb71c 100755
--- a/bin/ebuild-helpers/dosym
+++ b/bin/ebuild-helpers/dosym
@@ -21,14 +21,6 @@ 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#/}"
 
 ret=$?
--
2.24.1


Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] dosym: revert deprecated prefix compat (bug 615594)

Ulrich Müller
>>>>> On Sun, 19 Jan 2020, Zac Medico wrote:

> --- a/bin/ebuild-helpers/dosym
> +++ b/bin/ebuild-helpers/dosym
> @@ -21,14 +21,6 @@ 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#/}"
The intermediate "target" variable is no longer needed, you can simply
say "$1" here.

Ulrich

signature.asc (517 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] dosym: revert deprecated prefix compat (bug 615594)

Zac Medico-2
On 1/19/20 11:33 AM, Ulrich Mueller wrote:

>>>>>> On Sun, 19 Jan 2020, Zac Medico wrote:
>
>> --- a/bin/ebuild-helpers/dosym
>> +++ b/bin/ebuild-helpers/dosym
>> @@ -21,14 +21,6 @@ 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#/}"
>
> The intermediate "target" variable is no longer needed, you can simply
> say "$1" here.
Ok thanks, I've updated my branch.
--
Thanks,
Zac


signature.asc (1000 bytes) Download Attachment