Re: [gentoo-portage-dev] [PATCH] doins: don't clobber _E_INSDESTTREE_

[Michał Górny]

W dniu czw, 08.03.2018 o godzinie 14∶17 -0500, użytkownik Mike Gilbert
napisał:
> This might be set by another helper function (doconfd, doenvd, doheader).
> 
> Bug: https://bugs.gentoo.org/649946
> Fixes: a5d0111d0bdaa7ee9e5c68e22b4a97ce415e119b
> ---
>  bin/ebuild-helpers/doins | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
> index 327d409a4..219bbe5d7 100755
> --- a/bin/ebuild-helpers/doins
> +++ b/bin/ebuild-helpers/doins
> @@ -20,7 +20,7 @@ else
>   if ! ___eapi_has_DESTTREE_INSDESTTREE; then
>   [[ -n ${INSDESTTREE} ]] &&
>   die "${0##*/}: \${INSDESTTREE} has been banned for EAPI 
> '$EAPI'; use 'into' instead"
> - else
> + elif [[ -z ${_E_INSDESTTREE_+set} ]]; then
>   # backwards compatibility
>   _E_INSDESTTREE_=${INSDESTTREE}
>   fi

This breaks using INSDESTTREE completely since _E_INSDESTTREE_ is always
set (defaulted).

-- 
Best regards,
Michał Górny

[gentoo-portage-dev] [PATCH] doins: don't clobber _E_INSDESTTREE_

[Mike Gilbert]

This might be set by another helper function (doconfd, doenvd, doheader).

Bug: https://bugs.gentoo.org/649946
Fixes: a5d0111d0bdaa7ee9e5c68e22b4a97ce415e119b
---
 bin/ebuild-helpers/doins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index 327d409a4..219bbe5d7 100755
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -20,7 +20,7 @@ else
if ! ___eapi_has_DESTTREE_INSDESTTREE; then
[[ -n ${INSDESTTREE} ]] &&
die "${0##*/}: \${INSDESTTREE} has been banned for EAPI 
'$EAPI'; use 'into' instead"
-   else
+   elif [[ -z ${_E_INSDESTTREE_+set} ]]; then
# backwards compatibility
_E_INSDESTTREE_=${INSDESTTREE}
fi
-- 
2.16.2