From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E4E36158128 for ; Tue, 17 Jun 2025 23:42:21 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D0BB6341CC0 for ; Tue, 17 Jun 2025 23:42:21 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 389491104E1; Tue, 17 Jun 2025 23:42:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 2FD811104DE for ; Tue, 17 Jun 2025 23:42:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D53C134168D for ; Tue, 17 Jun 2025 23:42:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4606129EF for ; Tue, 17 Jun 2025 23:42:13 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1750203648.f8f4910895ec20028da12e4e50ccdc98d7658c30.sam@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/emerge-webrsync X-VCS-Directories: bin/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f8f4910895ec20028da12e4e50ccdc98d7658c30 X-VCS-Branch: master Date: Tue, 17 Jun 2025 23:42:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa62eba1-769c-4e15-a1b4-9b7c5f719697 X-Archives-Hash: a9814ebd36578cda3db4cc18ddbbb1f8 commit: f8f4910895ec20028da12e4e50ccdc98d7658c30 Author: Kerin Millar plushkava net> AuthorDate: Tue Jun 17 23:12:48 2025 +0000 Commit: Sam James gentoo org> CommitDate: Tue Jun 17 23:40:48 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f8f49108 emerge-webrsync: always pass --fail and --show-error to curl(1) Presently, the fetch_file() function extends the value of 'FETCHCOMMAND' with the -f (--fail) option, but only where both of the following conditions hold true: 1) curl(1) has been detected as the user-agent to be executed 2) the user passed the --quiet option to emerge-webrsync The second of these conditions is inappropriate because -f affects how curl(1) chooses its exit status value. In particular, the option ensures that it exits with a status other than zero in the event that the HTTP server responds with a code between 400 and 499. This behaviour is useful for scripting purposes and should not be contingent upon whether the user has requested for emerge-webrsync to be quiet. Address this issue by ensuring that curl(1) is given both the -f and -S (--show-error) options, unconditionally. The latter option prevents the -s option from suppressing all diagnostics in the event of an error. Signed-off-by: Kerin Millar plushkava.net> Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 6d6dd254e9..f0637c2258 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -224,9 +224,9 @@ fetch_file() { fi ;; *curl*) - opts="--continue-at" + opts="--continue-at -f -S" if (( opt[quiet] )); then - opts+=" -s -f" + opts+=" -s" fi ;; *)