RepoMirrors/abuild
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/abuild.git synced 2025-01-11 17:29:52 +00:00
Code Issues Projects Releases Wiki Activity

abuild-fetch: retry download if byte range is unsupported

Browse Source 
fixes #10004
This commit is contained in:
Natanael Copa 2020-07-08 10:10:26 +02:00
parent 2cc63809ad
commit 2be7002cda
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
abuild-fetch.c
View File

@ -142,7 +142,7 @@ int fetch(char *url, const char *destdir, bool insecure)
if (access(partfile, F_OK) == 0) { if (access(partfile, F_OK) == 0) {
printf("Partial download found. Trying to resume.\n"); printf("Partial download found. Trying to resume.\n");
add_opt(&curlcmd, "-C"); add_opt(&curlcmd, "--continue-at");
add_opt(&curlcmd, "-"); add_opt(&curlcmd, "-");
add_opt(&wgetcmd, "-c"); add_opt(&wgetcmd, "-c");
} }
@ -154,8 +154,16 @@ int fetch(char *url, const char *destdir, bool insecure)
/* CURLE_RANGE_ERROR (33) /* CURLE_RANGE_ERROR (33)
The server does not support or accept range requests. */ The server does not support or accept range requests. */
if (status == 33) if (status == 33) {
unlink(partfile); unlink(partfile);
if( curlcmd.argc >=3) {
/* remove --continue-at - options */
curlcmd.argv[curlcmd.argc-3] = curlcmd.argv[curlcmd.argc-1];
curlcmd.argv[curlcmd.argc-2] = NULL;
curlcmd.argc -= 2;
status = fork_exec(curlcmd.argv, 0);
}
}
/* is we failed execute curl, then fallback to wget */ /* is we failed execute curl, then fallback to wget */
if (status == 201) if (status == 201)