From nobody Tue Jan 25 05:48:50 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E08411978D64; Tue, 25 Jan 2022 05:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JjbWR4Ft0z3v4d; Tue, 25 Jan 2022 05:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643089731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GiMVWubrQFLDAJIEf4slbhqaPAl+BnPiweItk5zHlW8=; b=Y5/Su2p90+DJ7/X6j11af9u+pWSXH0J6k95ImJvJVobaEuSVgkhpdTHwVEpZxZqjjYnBrT p6Zm8qCsRkj/cORwtFTI1yOPxnuku/8xQ1L1KBQJ3VmxSkR0wCKCO32GXaennDTaysFbgu VFRB8TDmPl50YGirOsWfPGAQZ/15PjsQNAyy34skkqm/mEeX7wh2QyE37beWnVNOeSXpM2 2qGwlqil5BwYryVhuM6BypjktXu6PZcJzVLzYEG+yuXx7H4lE6KQlBwsjnyebDHz7V1Tpg CGxjEaP8o/C5ZCp/l+4idOjPe6RV8Rg32/cM+iMj9qiJrFvWJm0ODiLENdhKiw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1FE7C24164; Tue, 25 Jan 2022 05:48:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20P5mom8077485; Tue, 25 Jan 2022 05:48:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20P5moaW077484; Tue, 25 Jan 2022 05:48:50 GMT (envelope-from git) Date: Tue, 25 Jan 2022 05:48:50 GMT Message-Id: <202201250548.20P5moaW077484@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eugene Grosbein Subject: git: 85f15576b423 - main - fetch(1): more fixes for soft failure handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85f15576b423b9ad5b8a9e6dab3e71558ebe4335 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643089731; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GiMVWubrQFLDAJIEf4slbhqaPAl+BnPiweItk5zHlW8=; b=wJNSKwZzjPAcP1OtWUxPDoUDoIwDmd90NqULq6NjBUPzIcLu4xgipOtvRFTrHdGuZitHyP ZM6sUSLMQ4j9gMJ71FmzfwOMtoo7I9HkY6BOIoHgl9i3aRapPfy1WKkHhDABn7epUMDBMV hHKFidCMdMudpoIv5ltjcjhrAUKwnZVcK8xbO2F8VacC7+XOxPormeYn0apLXRVBDB8n0+ lwFsul/gca6lvuIelzADhWRBc5FSiVhik8tjl23l83f12iDfuf6uhp9IY8One2847iQUN1 qTXhi4elieKd9q0tMdEB2J9wff5nbWwYEaA32KDKxsR5sfSlWCLLX842Fi/JEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643089731; a=rsa-sha256; cv=none; b=EdXZr3YbSozhPd1azKI4UK9Cl3L2ARf7nqUOXXkBvOtgqb5lzufe8NYpee7DpzkQfRQ9cK Qk9DBvYe5c2+Zm834mK4e/v7W01sgVmBwJkgGPJyPKqwZVcsKwtbcPK8UsGhO/jX21hVJZ z2KRRv8z0OJXYAbhhAcyy94r1PWi2v/qnTYdQFzY5PFtrgxZfZOIdEwQba6gaZWnWrQkr1 6JC/dJAdrBgg+O6ZIC63msRVH0iHCE8vTEEkv8VE/4JLQcIi2ZzOQYRbOP8wABgmnWr/IH 8MSGyqiyvl/ojJPYqepXEvEUEiwFE373U1hdFZ8ewC0r2YFXKzmpc/MZDrHSTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=85f15576b423b9ad5b8a9e6dab3e71558ebe4335 commit 85f15576b423b9ad5b8a9e6dab3e71558ebe4335 Author: Eugene Grosbein AuthorDate: 2022-01-25 05:46:07 +0000 Commit: Eugene Grosbein CommitDate: 2022-01-25 05:48:28 +0000 fetch(1): more fixes for soft failure handling Fix logic error introduced in my commit bf599c03f09dea0f7e188e002b42d782af6841c3 Also, authorization errors should not be considered as soft failures. --- usr.bin/fetch/fetch.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/usr.bin/fetch/fetch.c b/usr.bin/fetch/fetch.c index 65ba091e3334..73ee96541859 100644 --- a/usr.bin/fetch/fetch.c +++ b/usr.bin/fetch/fetch.c @@ -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);