d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch(1): more fixes for soft failure handling

Browse Source 
Fix logic error introduced in my commit
bf599c03f0

Also, authorization errors should not be considered as soft failures.
This commit is contained in:
Eugene Grosbein 2022-01-25 12:46:07 +07:00
parent 80fc25025f
commit 85f15576b4
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
usr.bin/fetch/fetch.c
View File

@ -1200,17 +1200,18 @@ main(int argc, char *argv[])
if (e) {
r = 1;
if ((fetchLastErrCode
&& fetchLastErrCode != FETCH_AUTH
&& fetchLastErrCode != FETCH_UNAVAIL
&& fetchLastErrCode != FETCH_MOVED
&& fetchLastErrCode != FETCH_URL
&& fetchLastErrCode != FETCH_RESOLV
&& fetchLastErrCode != FETCH_UNKNOWN
&& (is_http
&& fetchLastErrCode != FETCH_PROTO
&& (!is_http || (
fetchLastErrCode != FETCH_PROTO
&& fetchLastErrCode != FETCH_SERVER
&& fetchLastErrCode != FETCH_TEMP
&& fetchLastErrCode != FETCH_TIMEOUT
))) {
)))) {
if (w_secs && v_level)
fprintf(stderr, "Waiting %ld seconds "
"before retrying\n", w_secs);