commit:     937227f72d4e6eb057bb53f793686fe721f52ac2
Author:     Mike Frysinger <vapier <AT> chromium <DOT> org>
AuthorDate: Tue Feb 15 21:28:02 2022 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> 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 <vapier <AT> 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

Reply via email to