Prevent loading user's aria2.conf (yyuu/pyenv#625)

This commit is contained in:
Yamashita, Yuu 2016-06-22 00:37:56 +00:00
parent 63e76cc261
commit 6baed1ff66
2 changed files with 3 additions and 3 deletions

View file

@ -313,12 +313,12 @@ http() {
}
http_head_aria2c() {
aria2c --dry-run ${ARIA2_OPTS} "$1" >&4 2>&1
aria2c --dry-run --no-conf=true ${ARIA2_OPTS} "$1" >&4 2>&1
}
http_get_aria2c() {
local out="${2:-$(mktemp "out.XXXXXX")}"
if aria2c --allow-overwrite=true -o "${out}" ${ARIA2_OPTS} "$1" >&4; then
if aria2c --allow-overwrite=true --no-conf=true -o "${out}" ${ARIA2_OPTS} "$1" >&4; then
[ -n "$2" ] || cat "${out}"
else
false

View file

@ -21,7 +21,7 @@ setup() {
}
@test "using aria2c if available" {
stub aria2c "* -o * http://example.com/* : cp $FIXTURE_ROOT/\${4##*/} \$3"
stub aria2c "--allow-overwrite=true --no-conf=true -o * http://example.com/* : cp $FIXTURE_ROOT/\${5##*/} \$4"
install_fixture definitions/without-checksum
assert_success