[gentoo-python] [PATCH distutils-r1 3/6] _distutils-r1_rename_scripts: require explicit path.

[Michał Górny]

---
 gx86/eclass/distutils-r1.eclass | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/gx86/eclass/distutils-r1.eclass b/gx86/eclass/distutils-r1.eclass
index 0d8df87..e1e89c6 100644
--- a/gx86/eclass/distutils-r1.eclass
+++ b/gx86/eclass/distutils-r1.eclass
@@ -244,15 +244,20 @@ distutils-r1_python_test() {
 }
 
 # @FUNCTION: _distutils-r1_rename_scripts
+# @USAGE: <path>
 # @INTERNAL
 # @DESCRIPTION:
 # Renames installed Python scripts to be implementation-suffixed.
-# ${PYTHON} has to be set to the expected Python executable (which
-# hashbang will be grepped for), and ${EPYTHON} to the implementation
-# name (for new name).
+# ${EPYTHON} needs to be set to the implementation name.
+#
+# All executable scripts having shebang referencing ${EPYTHON}
+# in given path will be renamed.
 _distutils-r1_rename_scripts() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local path=${1}
+	[[ ${path} ]] || die "${FUNCNAME}: no path given"
+
 	local f
 	# XXX: change this if we ever allow directories in bin/sbin
 	while IFS= read -r -d '' f; do
@@ -266,14 +271,14 @@ _distutils-r1_rename_scripts() {
 			debug-print "${FUNCNAME}: renamed to ${newf#${D}/}"
 			mv "${f}" "${newf}" || die
 		fi
-	done < <(find "${D}" -type f -executable -print0)
+	done < <(find "${path}" -type f -executable -print0)
 }
 
 # @FUNCTION: distutils-r1_python_install
 # @USAGE: [additional-args...]
 # @DESCRIPTION:
 # The default python_install(). Runs 'esetup.py install', appending
-# the optimization flags. Then calls _distutils-r1_rename_scripts.
+# the optimization flags. Then renames the installed scripts.
 # Any parameters passed to this function will be passed to setup.py.
 distutils-r1_python_install() {
 	debug-print-function ${FUNCNAME} "${@}"
@@ -294,7 +299,7 @@ distutils-r1_python_install() {
 
 	esetup.py install "${flags[@]}" --root="${D}" "${@}"
 
-	_distutils-r1_rename_scripts
+	_distutils-r1_rename_scripts "${D}"
 }
 
 # @FUNCTION: distutils-r1_python_install_all
-- 
1.8.0