From fc23323ed4543d754ec8d2e8c1a88b934fb79737 Mon Sep 17 00:00:00 2001 From: "Yamashita, Yuu" Date: Wed, 9 Aug 2017 22:22:05 +0900 Subject: [PATCH] Revert "Avoid choosing virtualenv when building PyPy from source" This reverts commit 63c00d99899971c3ed9a3ee01c69b8b3a194e171. --- plugins/python-build/bin/pyenv-install | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/plugins/python-build/bin/pyenv-install b/plugins/python-build/bin/pyenv-install index 844b47ec..6705d4bc 100755 --- a/plugins/python-build/bin/pyenv-install +++ b/plugins/python-build/bin/pyenv-install @@ -207,12 +207,8 @@ if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then else for version in $(pyenv-versions --bare | sort -r); do if [[ "${version}" == "2.7"* ]]; then - if [ -f "$(pyenv-prefix "${version}")/bin/activate" ]; then - : # avoid choosing virtualenv since it may not have some necessary modules (e.g. cffi, pycparser) - else - PYENV_BOOTSTRAP_VERSION="$version" - break - fi + PYENV_BOOTSTRAP_VERSION="$version" + break fi done fi