From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 28B7A15810D for ; Wed, 17 May 2023 06:20:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56249E0844; Wed, 17 May 2023 06:20:25 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 425F8E0844 for ; Wed, 17 May 2023 06:20:25 +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 567FD335DBE for ; Wed, 17 May 2023 06:20:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B0650A68 for ; Wed, 17 May 2023 06:20:22 +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: <1684304416.66c00b2e3d72bc8947fc802b0403687853e16e13.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: 66c00b2e3d72bc8947fc802b0403687853e16e13 X-VCS-Branch: master Date: Wed, 17 May 2023 06:20:22 +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: 780b058f-7655-426b-92f7-4dcf013f1257 X-Archives-Hash: 36d01e4398bd1038600c03140913e4b7 commit: 66c00b2e3d72bc8947fc802b0403687853e16e13 Author: Sam James gentoo org> AuthorDate: Wed May 17 06:18:25 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed May 17 06:20:16 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=66c00b2e emerge-webrsync: add fallback error case This would've helped avoid a loop where we keep trying old snapshots if gemato wasn't installed. We already have a fix for that separately with a more specific error, but a fallback is good for unexpected ones. Bug: https://bugs.gentoo.org/905868 Closes: https://github.com/gentoo/portage/pull/1039 Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index e707f8b9b..7fed4e790 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -361,6 +361,11 @@ check_file_signature() { r=$? ;; esac + + if [[ ${r} != 0 ]] ; then + eerror "Error occurred in check_file_signature: ${r}. Aborting." + die "Verification error occured." + fi else r=0 fi