1. Forum
  2. Usenet
  3. LINUX.GENTOO.DEV

  • [gentoo-dev] [PATCH 1/4] python-any-r1.eclass: Fix unsupported/invalid

    From =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?@21:1/5 to All on Wed Feb 23 00:40:01 2022
    Fix the unsupported/invalid EPYTHON logic to make more sense.
    As a result of prior refactoring, the eclass would report all invalid
    EPYTHON values as unsupported and the invalid branch would never
    be reached -- except for the special case of python2_7 where it would incorrectly reject it. Fix it, so that unsupported EPYTHON values
    are reported either as "just unsupported" or incorrect values correctly.

    Signed-off-by: Michał Górny <mgorny@gentoo.org>
    ---
    eclass/python-any-r1.eclass | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
    index 4e954f57cd2d..805981bb7aa8 100644
    --- a/eclass/python-any-r1.eclass
    +++ b/eclass/python-any-r1.eclass
    @@ -302,9 +302,11 @@ python_setup() {
    local epython_impl=${EPYTHON/./_}
    if [[ ${epython_impl} ]]; then
    if ! has "${epython_impl}" "${_PYTHON_SUPPORTED_IMPLS[@]}"; then
    - einfo "EPYTHON (${EPYTHON}) not supported by the package"
    - elif ! has "${epython_impl}" "${_PYTHON_ALL_IMPLS[@]}"; then
    - ewarn "Invalid EPYTHON: ${EPYTHON}"
    + if ! has "${epython_impl}" "${_PYTHON_ALL_IMPLS[@]}"; then
    + ewarn "Invalid EPYTHON: ${EPYTHON}"
    + else
    + einfo "EPYTHON (${EPYTHON}) not supported by the package"
    + fi
    elif _python_run_check_deps "${epython_impl}"; then
    _python_export EPYTHON PYTHON
    _python_wrapper_setup
    --
    2.35.1

    --- SoupGate-Win32 v1.05
    * Origin: fsxNet Usenet Gateway (21:1/5)