github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'issue411'

Browse source
This commit is contained in:
Yamashita, Yuu 2015-07-22 10:49:49 +09:00
commit 24ad375a35
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/python-build/bin/python-build
View file

@ -1552,7 +1552,7 @@ build_package_get_pip() {
http get "${GET_PIP_URL}" http get "${GET_PIP_URL}"
fi fi
} 1> "${get_pip}" } 1> "${get_pip}"
"${PYTHON_BIN}" "${get_pip}" ${GET_PIP_OPTS} 1>&4 2>&1 || { "${PYTHON_BIN}" -s "${get_pip}" ${GET_PIP_OPTS} 1>&4 2>&1 || {
echo "error: failed to install pip via get-pip.py" >&2 echo "error: failed to install pip via get-pip.py" >&2
return 1 return 1
} }
@ -1565,7 +1565,7 @@ build_package_ensurepip() {
ensurepip_opts="--altinstall" ensurepip_opts="--altinstall"
fi fi
# FIXME: `--altinstall` with `get-pip.py` # FIXME: `--altinstall` with `get-pip.py`
"$PYTHON_BIN" -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1 "$PYTHON_BIN" -s -m ensurepip ${ensurepip_opts} 1>/dev/null 2>&1 || build_package_get_pip "$@" || return 1
} }
version() { version() {

4
plugins/python-build/test/pyenv_ext.bats
View file

@ -178,7 +178,7 @@ OUT
assert_success assert_success
assert_build_log <<OUT assert_build_log <<OUT
python -m ensurepip python -s -m ensurepip
OUT OUT
} }
@ -196,7 +196,7 @@ OUT
assert_success assert_success
assert_build_log <<OUT assert_build_log <<OUT
python -m ensurepip --altinstall python -s -m ensurepip --altinstall
OUT OUT
} }