python-any-r1.eclass: Ensure not to emit := in || () deps
authorMichał Górny <mgorny@gentoo.org>
Sun, 12 Jun 2016 20:30:39 +0000 (22:30 +0200)
committerMichał Górny <mgorny@gentoo.org>
Sun, 12 Jun 2016 20:32:56 +0000 (22:32 +0200)
eclass/python-any-r1.eclass

index c6dfc9c7aecb9b60753a08754390cb2cffc1103d..0b49944c5199baae69617beb38675d08cf64b910 100644 (file)
@@ -137,7 +137,8 @@ _python_any_set_globals() {
        for i in "${_PYTHON_SUPPORTED_IMPLS[@]}"; do
                python_export "${i}" PYTHON_PKG_DEP
 
-               PYTHON_DEPS="${PYTHON_PKG_DEP} ${PYTHON_DEPS}"
+               # note: need to strip '=' slot operator for || deps
+               PYTHON_DEPS="${PYTHON_PKG_DEP%=} ${PYTHON_DEPS}"
        done
        PYTHON_DEPS="|| ( ${PYTHON_DEPS})"
        readonly PYTHON_DEPS
@@ -220,7 +221,8 @@ python_gen_any_dep() {
                python_export "${i}" PYTHON_PKG_DEP
 
                local i_depstr=${depstr//\$\{PYTHON_USEDEP\}/${PYTHON_USEDEP}}
-               out="( ${PYTHON_PKG_DEP} ${i_depstr} ) ${out}"
+               # note: need to strip '=' slot operator for || deps
+               out="( ${PYTHON_PKG_DEP%=} ${i_depstr} ) ${out}"
        done
        echo "|| ( ${out})"
 }