[gentoo-commits] proj/eselect-python:master commit in: /

["Michał Górny" <mgorny@gentoo.org>]

commit:     a3421a53b669fd15c6449203700163712532e4f2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 12 16:40:08 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 12 16:53:37 2015 +0000
URL:        https://gitweb.gentoo.org/proj/eselect-python.git/commit/?id=a3421a53

Store selected python[23] version in a file

Use /etc/env.d/python/python[23] file to store the active Python2/3
interpreter rather than /usr/bin/python[23] symlink target. This is
simpler, more portable and allows us to replace symlinks with real
wrappers.

 python.eselect.in | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/python.eselect.in b/python.eselect.in
index 8baa44e..32d9cbf 100644
--- a/python.eselect.in
+++ b/python.eselect.in
@@ -33,6 +33,13 @@ find_targets() {
 	done
 }
 
+set_python_subver() {
+	local target=${1}
+	local subver=${target%.*}
+	mkdir -p "${ENV_D_PATH}/python"
+	echo "${target}" > "${ENV_D_PATH}/python/${subver}"
+}
+
 set_python() {
 	local symlink="${INTERPRETER_PATH}python" target="${1}"
 	ln -s python-wrapper "${symlink}"
@@ -119,6 +126,7 @@ set_scripts_and_symlinks() {
 		pushd "${INTERPRETER_PATH}" 1> /dev/null
 
 		ln -nfs "${target}" "${target%.*}"
+		set_python_subver "${target}"
 		if [[ "${SET_MAIN_ACTIVE_PYTHON_INTERPRETER}" == "1" ]]; then
 			set_python "${target}"
 			set_python_config "${target/python/python-config-}"
@@ -205,9 +213,9 @@ do_show() {
 	fi
 
 	if [[ "${python2}" == "1" ]]; then
-		interpreter="$(readlink "${INTERPRETER_PATH}python2")"
+		interpreter="$(<"${ENV_D_PATH}/python/python2")"
 	elif [[ "${python3}" == "1" ]]; then
-		interpreter="$(readlink "${INTERPRETER_PATH}python3")"
+		interpreter="$(<"${ENV_D_PATH}/python/python3")"
 	elif [[ -f "${ENV_D_PATH}/python/config" ]]; then
 		interpreter="$(<"${ENV_D_PATH}/python/config")"
 	fi