Sfoglia il codice sorgente

Merge pull request #1051 from LWisteria/do_not_check_wget_version

Check wget version iff wget is going to be used
pull/1053/head
Yamashita, Yuu 6 anni fa
committed by GitHub
parent
commit
b6929531c6
Non sono state trovate chiavi note per questa firma nel database ID Chiave GPG: 4AEE18F83AFDEB23
1 ha cambiato i file con 5 aggiunte e 6 eliminazioni
  1. +5
    -6
      plugins/python-build/bin/python-build

+ 5
- 6
plugins/python-build/bin/python-build Vedi File

@ -330,6 +330,11 @@ http() {
elif type curl &>/dev/null; then
"http_${method}_curl" "$url" "$file"
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_${method}_wget" "$url" "$file"
else
echo "error: please install \`aria2c\`, \`curl\` or \`wget\` and try again" >&2
@ -2051,12 +2056,6 @@ if [[ "$PYTHON_CONFIGURE_OPTS" != *"--enable-unicode="* ]]; then
fi
fi
# SSL Certificate error with older wget that does not support Server Name Indication (#60)
if ! command -v curl 1>/dev/null 2>&1 && [[ "$(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
exit 1
fi
# Unset `PIP_REQUIRE_VENV` during build (#216)
unset PIP_REQUIRE_VENV
unset PIP_REQUIRE_VIRTUALENV

Caricamento…
Annulla
Salva