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 1C1ED15808C for ; Tue, 15 Feb 2022 21:30:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 579D9E07C9; Tue, 15 Feb 2022 21:30:57 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 42823E07C9 for ; Tue, 15 Feb 2022 21:30:57 +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 6CAE73432A9 for ; Tue, 15 Feb 2022 21:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C269D2D7 for ; Tue, 15 Feb 2022 21:30:54 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1644960482.937227f72d4e6eb057bb53f793686fe721f52ac2.vapier@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/isolated-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 937227f72d4e6eb057bb53f793686fe721f52ac2 X-VCS-Branch: master Date: Tue, 15 Feb 2022 21:30:54 +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: 5ebd6cd4-0c1e-4ecf-9a64-cf88f2ca6109 X-Archives-Hash: 5e8f5cfac24a7023b89ae22bde634962 commit: 937227f72d4e6eb057bb53f793686fe721f52ac2 Author: Mike Frysinger chromium org> AuthorDate: Tue Feb 15 21:28:02 2022 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Feb 15 21:28:02 2022 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=937227f7 die: omit $S display if not set If die is used during the depend phase, there is no $S setting, so don't bother displaying it in the first place. This cuts down on the log spam a bit. Signed-off-by: Mike Frysinger gentoo.org> bin/isolated-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index 51678958b..bd8c065b2 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -227,7 +227,7 @@ die() { eerror "The ebuild environment file is located at '${T}/die.env'." fi eerror "Working directory: '$(pwd)'" - eerror "S: '${S}'" + [[ -n ${S} ]] && eerror "S: '${S}'" [[ -n $PORTAGE_EBUILD_EXIT_FILE ]] && > "$PORTAGE_EBUILD_EXIT_FILE" [[ -n $PORTAGE_IPC_DAEMON ]] && "$PORTAGE_BIN_PATH"/ebuild-ipc exit 1