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 381DC15ACFB for ; Sun, 9 Apr 2023 07:26:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E12BE0848; Sun, 9 Apr 2023 07:26:27 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 53E72E0848 for ; Sun, 9 Apr 2023 07:26:27 +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 7711A33C6B6 for ; Sun, 9 Apr 2023 07:26:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3C9E48E6 for ; Sun, 9 Apr 2023 07:26:23 +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: <1681025154.c5e725e4d50f13e68a7e2ff127607d225b221eee.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: c5e725e4d50f13e68a7e2ff127607d225b221eee X-VCS-Branch: master Date: Sun, 9 Apr 2023 07:26:23 +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: 837be19b-5d9b-4fce-ab88-4dbcad731c05 X-Archives-Hash: e23e4c30a23bc42dde86b85ce00e3411 commit: c5e725e4d50f13e68a7e2ff127607d225b221eee Author: Sam James gentoo org> AuthorDate: Sun Apr 9 07:25:54 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sun Apr 9 07:25:54 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=c5e725e4 emerge-webrsync: always exit 1 in die() eerror doesn't necessarily always return 1, so not necessarily going to hit the && .. case. Signed-off-by: Sam James gentoo.org> bin/emerge-webrsync | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync index 83bb3ca1a..8ef22cbe9 100755 --- a/bin/emerge-webrsync +++ b/bin/emerge-webrsync @@ -65,7 +65,8 @@ nvecho() { [[ ${PORTAGE_QUIET} == 1 ]] && echo "$@" ; } # Unfortunately, gentoo-functions doesn't yet have a die() (bug #878505) die() { - eerror "$@" && exit 1 + eerror "$@" + exit 1 } argv0=$0