commit:     3a8167567e4f7f938da9c34ca0a02ea2eac8de65
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 10:08:27 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 13:15:58 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a816756

python-utils-r1.eclass: Fix python_optimize to take all of sys.path

Make sure to append NUL to every path in sys.path, rather than using
it as a separator between output entries.  This fixes a bug when
the last path entry was silently discarded, and the function stopped
working with PyPy as a result.

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-utils-r1.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index f8f51ecb694..549dd5f2e56 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -692,7 +692,7 @@ python_optimize() {
                        if [[ ${f} == /* && -d ${D%/}${f} ]]; then
                                set -- "${D%/}${f}" "${@}"
                        fi
-               done < <("${PYTHON}" -c 'import sys; 
print("\0".join(sys.path))' || die)
+               done < <("${PYTHON}" -c 'import sys; print("".join(x + "\0" for 
x in sys.path))' || die)
 
                debug-print "${FUNCNAME}: using sys.path: ${*/%/;}"
        fi

Reply via email to