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.
This commit is contained in:
parent
cc9c72747a
commit
583f3b0e21
@ -152,9 +152,9 @@ fi
|
|||||||
# Python 3.4 installer requires an existing Python installation to run. An
|
# Python 3.4 installer requires an existing Python installation to run. An
|
||||||
# unsatisfied local .python-version file can cause the installer to
|
# unsatisfied local .python-version file can cause the installer to
|
||||||
# fail.)
|
# fail.)
|
||||||
if [ -z "${PYENV_VERSION}" ]; then
|
#if [ -z "${PYENV_VERSION}" ]; then
|
||||||
export PYENV_VERSION="$(pyenv global 2>/dev/null || true)"
|
# export PYENV_VERSION="$(pyenv global 2>/dev/null || true)"
|
||||||
fi
|
#fi
|
||||||
|
|
||||||
|
|
||||||
# Execute `before_install` hooks.
|
# Execute `before_install` hooks.
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Python 3.4 requires "python3.4" to be executable if it is in ${PATH}.
|
# 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-which python3.4 1>/dev/null 2>&1; then
|
||||||
if pyenv-whence 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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user