From: Michał Górny <mgorny@gentoo.org>
Date: Wed, 23 Oct 2019 10:08:27 +0000 (+0200)
Subject: python-utils-r1.eclass: Fix python_optimize to take all of sys.path
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3a8167567e4f7f938da9c34ca0a02ea2eac8de65;p=gentoo.git

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@gentoo.org>
---

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index f8f51ecb694a..549dd5f2e56e 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