diff options
author | Michał Górny <mgorny@gentoo.org> | 2021-06-20 08:58:17 +0200 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2021-06-23 23:44:05 +0200 |
commit | addf1c599306fa5404929ac208108f410b490bb9 (patch) | |
tree | 76c775fd425b1c9b2c0d33123ff75e9039d7e23e /eclass/python-utils-r1.eclass | |
parent | python-utils-r1.eclass: Remove python_optimize support for py<3.5 (diff) | |
download | gentoo-addf1c599306fa5404929ac208108f410b490bb9.tar.gz gentoo-addf1c599306fa5404929ac208108f410b490bb9.tar.bz2 gentoo-addf1c599306fa5404929ac208108f410b490bb9.zip |
python-utils-r1.eclass: Rename *into vars to use underscores
Rename helper variables used by *into to mark them private with
underscores. The old names are leftovers from deprecated API that
permitted setting them directly. It was last used in ::gentoo in 2016.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'eclass/python-utils-r1.eclass')
-rw-r--r-- | eclass/python-utils-r1.eclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index e3b8e51065a3..a75709f19ea0 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -658,7 +658,7 @@ python_optimize() { python_scriptinto() { debug-print-function ${FUNCNAME} "${@}" - python_scriptroot=${1} + _PYTHON_SCRIPTROOT=${1} } # @FUNCTION: python_doexe @@ -693,7 +693,7 @@ python_newexe() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' [[ ${#} -eq 2 ]] || die "Usage: ${FUNCNAME} <path> <new-name>" - local wrapd=${python_scriptroot:-/usr/bin} + local wrapd=${_PYTHON_SCRIPTROOT:-/usr/bin} local f=${1} local newfn=${2} @@ -797,7 +797,7 @@ python_newscript() { python_moduleinto() { debug-print-function ${FUNCNAME} "${@}" - python_moduleroot=${1} + _PYTHON_MODULEROOT=${1} } # @FUNCTION: python_domodule @@ -821,13 +821,13 @@ python_domodule() { [[ ${EPYTHON} ]] || die 'No Python implementation set (EPYTHON is null).' local d - if [[ ${python_moduleroot} == /* ]]; then + if [[ ${_PYTHON_MODULEROOT} == /* ]]; then # absolute path - d=${python_moduleroot} + d=${_PYTHON_MODULEROOT} else # relative to site-packages local sitedir=$(python_get_sitedir) - d=${sitedir#${EPREFIX}}/${python_moduleroot//.//} + d=${sitedir#${EPREFIX}}/${_PYTHON_MODULEROOT//.//} fi ( |