commit: 6a738002397ab9cfe1ff02571ffb4cddb596544a Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Jan 22 03:38:14 2019 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Wed Jan 23 02:41:56 2019 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6a738002
inherit: use local -x ECLASS (bug 676014) Use local -x ECLASS, and also make __export_funcs_var a local variable, since this is simpler than managing these variables as globals (eliminates PECLASS and prev_export_funcs_var variables). As an additional benefit, this prevents interference from ebuild variables as reported in bug 656354 for the ECLASS variable. Bug: https://bugs.gentoo.org/656354 Bug: https://bugs.gentoo.org/676014 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/ebuild.sh | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/bin/ebuild.sh b/bin/ebuild.sh index 0ec033ae7..d3bf0fd29 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -240,23 +240,22 @@ inherit() { ECLASS_DEPTH=$(($ECLASS_DEPTH + 1)) if [[ ${ECLASS_DEPTH} -gt 1 ]]; then debug-print "*** Multiple Inheritence (Level: ${ECLASS_DEPTH})" - fi - if [[ -n $ECLASS && -n ${!__export_funcs_var} ]] ; then - eqawarn "QA Notice: EXPORT_FUNCTIONS is called before inherit in ${ECLASS}.eclass." - eqawarn "For compatibility with <=portage-2.1.6.7, only call EXPORT_FUNCTIONS" - eqawarn "after inherit(s)." + # Since ECLASS_DEPTH > 1, the following variables are locals from the + # previous inherit call in the call stack. + if [[ -n ${ECLASS} && -n ${!__export_funcs_var} ]] ; then + eqawarn "QA Notice: EXPORT_FUNCTIONS is called before inherit in ${ECLASS}.eclass." + eqawarn "For compatibility with <=portage-2.1.6.7, only call EXPORT_FUNCTIONS" + eqawarn "after inherit(s)." + fi fi + local -x ECLASS + local __export_funcs_var local repo_location local location local potential_location local x - - # These variables must be restored before returning. - local PECLASS=$ECLASS - local prev_export_funcs_var=$__export_funcs_var - local B_IUSE local B_REQUIRED_USE local B_DEPEND @@ -268,7 +267,7 @@ inherit() { location="" potential_location="" - export ECLASS="$1" + ECLASS="$1" __export_funcs_var=__export_functions_$ECLASS_DEPTH unset $__export_funcs_var @@ -378,12 +377,6 @@ inherit() { shift done ((--ECLASS_DEPTH)) # Returns 1 when ECLASS_DEPTH reaches 0. - if (( ECLASS_DEPTH > 0 )) ; then - export ECLASS=$PECLASS - __export_funcs_var=$prev_export_funcs_var - else - unset ECLASS __export_funcs_var - fi return 0 }
