From fe934642c51d2a3c76bff6eb4728e091fc530daf Mon Sep 17 00:00:00 2001 From: Yamashita Yuu Date: Tue, 26 May 2015 23:49:46 +0900 Subject: [PATCH] Skip installint `setuptools` by `ez_setup.py` explicitly (fixes #381) `pip` will install `setuptools` automatically. --- plugins/python-build/bin/python-build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build index 2521c663..d956f2bb 100755 --- a/plugins/python-build/bin/python-build +++ b/plugins/python-build/bin/python-build @@ -1531,9 +1531,7 @@ build_package_ensurepip() { if [[ "$PYTHON_MAKE_INSTALL_TARGET" != *"altinstall"* ]]; then ensurepip_opts="--altinstall" fi - "$PYTHON_BIN" -m ensurepip $ensurepip_opts 1>/dev/null 2>&1 || { - build_package_ez_setup "$@" && build_package_get_pip "$@" - } || return 1 + "$PYTHON_BIN" -m ensurepip $ensurepip_opts 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1 } version() {