mirror of
https://github.com/pyenv/pyenv.git
synced 2024-11-07 20:31:01 -05:00
Merge pull request #1180 from LWisteria/wget_version_check
Check wget version iff wget is going to be used (again)
This commit is contained in:
commit
c057a80c82
1 changed files with 5 additions and 8 deletions
|
@ -339,6 +339,11 @@ http() {
|
|||
elif type curl &>/dev/null; then
|
||||
http_client="http_${method}_curl"
|
||||
elif type wget &>/dev/null; then
|
||||
# SSL Certificate error with older wget that does not support Server Name Indication (#60)
|
||||
if [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then
|
||||
echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2
|
||||
return 1
|
||||
fi
|
||||
http_client="http_${method}_wget"
|
||||
else
|
||||
echo "error: please install \`aria2c\`, \`curl\` or \`wget\` and try again" >&2
|
||||
|
@ -2040,14 +2045,6 @@ ARIA2_OPTS="${PYTHON_BUILD_ARIA2_OPTS} ${IPV4+--disable-ipv6=true} ${IPV6+--disa
|
|||
CURL_OPTS="${PYTHON_BUILD_CURL_OPTS} ${IPV4+--ipv4} ${IPV6+--ipv6}"
|
||||
WGET_OPTS="${PYTHON_BUILD_WGET_OPTS} ${IPV4+--inet4-only} ${IPV6+--inet6-only}"
|
||||
|
||||
if [ -z "${PYTHON_BUILD_HTTP_CLIENT}" ] && ! type aria2c &>/dev/null && ! type curl &>/dev/null; then
|
||||
# SSL Certificate error with older wget that does not support Server Name Indication (#60)
|
||||
if [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then
|
||||
echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
# Add an option to build a debug version of Python (#11)
|
||||
if [ -n "$DEBUG" ]; then
|
||||
package_option python configure --with-pydebug
|
||||
|
|
Loading…
Reference in a new issue