From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-847082-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1BAF21388C2 for <garchives@archives.gentoo.org>; Tue, 17 Nov 2015 18:36:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D8EC3E0870; Tue, 17 Nov 2015 18:36:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 35472E083C for <gentoo-commits@lists.gentoo.org>; Tue, 17 Nov 2015 18:36:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4F627340756 for <gentoo-commits@lists.gentoo.org>; Tue, 17 Nov 2015 18:36:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 08937B5D for <gentoo-commits@lists.gentoo.org>; Tue, 17 Nov 2015 18:36:28 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org> Message-ID: <1447347217.a3421a53b669fd15c6449203700163712532e4f2.mgorny@gentoo> Subject: [gentoo-commits] proj/eselect-python:master commit in: / X-VCS-Repository: proj/eselect-python X-VCS-Files: python.eselect.in X-VCS-Directories: / X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: a3421a53b669fd15c6449203700163712532e4f2 X-VCS-Branch: master Date: Tue, 17 Nov 2015 18:36:28 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: bbc53be8-8d72-4508-a419-d32978a8d244 X-Archives-Hash: 5e36d3107219df9c8ed1b78c35051aaa Message-ID: <20151117183628.1DwsdxWhG2TzCLHtYuJX7WnULW1GQJsVW88nt4TKCbM@z> 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