Merge branch 'use-https' (fixes #262)

This commit is contained in:
Yamashita Yuu 2014-11-05 09:25:36 -08:00
commit 665f9d9466
3 changed files with 3 additions and 3 deletions

View file

@ -1626,7 +1626,7 @@ else
fi fi
if [ -z "$PYTHON_BUILD_MIRROR_URL" ]; then if [ -z "$PYTHON_BUILD_MIRROR_URL" ]; then
PYTHON_BUILD_MIRROR_URL="http://yyuu.github.io/pythons" PYTHON_BUILD_MIRROR_URL="https://yyuu.github.io/pythons"
else else
PYTHON_BUILD_MIRROR_URL="${PYTHON_BUILD_MIRROR_URL%/}" PYTHON_BUILD_MIRROR_URL="${PYTHON_BUILD_MIRROR_URL%/}"
fi fi

View file

@ -59,7 +59,7 @@ setup() {
stub shasum true "echo invalid" "echo $checksum" stub shasum true "echo invalid" "echo $checksum"
stub curl "-*I* : true" \ stub curl "-*I* : true" \
"-q -o * -*S* http://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3" "-q -o * -*S* https://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3"
touch "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" touch "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz"

View file

@ -92,7 +92,7 @@ export PYTHON_BUILD_MIRROR_URL=http://mirror.example.com
stub shasum true "echo $checksum" stub shasum true "echo $checksum"
stub curl "-*I* : true" \ stub curl "-*I* : true" \
"-q -o * -*S* http://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3" \ "-q -o * -*S* https://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$3" \
install_fixture definitions/with-checksum install_fixture definitions/with-checksum
[ "$status" -eq 0 ] [ "$status" -eq 0 ]