From 583f3b0e2144c6fa3937068d1185062b2b8865f9 Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Wed, 19 Jun 2013 18:44:57 +0900 Subject: [PATCH] fix build of 3.4-dev. append existing 3.4 at the last. this is because `hg` (which is a dependency of *-dev build) might be installed in existing pyenv versions. --- plugins/python-build/bin/pyenv-install | 6 +++--- plugins/python-build/share/python-build/3.4-dev | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index 35b450a7..b8352f6e 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -152,9 +152,9 @@ fi # Python 3.4 installer requires an existing Python installation to run. An # unsatisfied local .python-version file can cause the installer to # fail.) -if [ -z "${PYENV_VERSION}" ]; then - export PYENV_VERSION="$(pyenv global 2>/dev/null || true)" -fi +#if [ -z "${PYENV_VERSION}" ]; then +# export PYENV_VERSION="$(pyenv global 2>/dev/null || true)" +#fi # Execute `before_install` hooks. diff --git a/plugins/python-build/share/python-build/3.4-dev b/plugins/python-build/share/python-build/3.4-dev index 94cef042..94d7d1ef 100644 --- a/plugins/python-build/share/python-build/3.4-dev +++ b/plugins/python-build/share/python-build/3.4-dev @@ -1,7 +1,7 @@ # Python 3.4 requires "python3.4" to be executable if it is in ${PATH}. if ! pyenv-which python3.4 1>/dev/null 2>&1; then if pyenv-whence python3.4 1>/dev/null 2>&1; then - export PYENV_VERSION="$(pyenv-whence python3.4 2>/dev/null | tail -1)" + export PYENV_VERSION="$(pyenv-version-name):$(pyenv-whence python3.4 2>/dev/null | tail -1)" fi fi