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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5F59B158015 for ; Wed, 20 Dec 2023 21:32:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9AEE82BC016; Wed, 20 Dec 2023 21:32:42 +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 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7ECDB2BC016 for ; Wed, 20 Dec 2023 21:32:42 +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 46BBE3406C2 for ; Wed, 20 Dec 2023 21:32:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 707809C4 for ; Wed, 20 Dec 2023 21:32:39 +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: <1703107856.23d47fe0ead50e4a98eb4b1a02f68d350f53a166.vapier@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 23d47fe0ead50e4a98eb4b1a02f68d350f53a166 X-VCS-Branch: master Date: Wed, 20 Dec 2023 21:32:39 +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: a4054a80-6234-4f8c-8309-281a5bba03cc X-Archives-Hash: 01a0a97d4c7ff818bb30fd1a1330f560 commit: 23d47fe0ead50e4a98eb4b1a02f68d350f53a166 Author: Brian Norris chromium org> AuthorDate: Tue Dec 5 23:19:50 2023 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Wed Dec 20 21:30:56 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=23d47fe0 qmerge: Send ewarn, etc., to stderr The PMS specifically calls out that ewarn should not display its message to stdout. Portage sends all e{log,info,warn,...} to stderr. Imitate that. This discrepancy causes problems for ghc-package.eclass users, for one, as there are instances where that class purposely dumps a warning and then expects its callers to still use its stdout as a result. Signed-off-by: Brian Norris chromium.org> Signed-off-by: Mike Frysinger chromium.org> Signed-off-by: Mike Frysinger gentoo.org> qmerge.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qmerge.c b/qmerge.c index 246a733..cbf94e6 100644 --- a/qmerge.c +++ b/qmerge.c @@ -794,8 +794,8 @@ pkg_run_func_at( "has() { hasq \"$@\"; }\n" "hasq() { local h=$1; shift; case \" $* \" in *\" $h \"*) return 0;; *) return 1;; esac; }\n" "hasv() { hasq \"$@\" && echo \"$1\"; }\n" - "elog() { printf ' * %%b\\n' \"$*\"; }\n" - "einfon() { printf ' * %%b' \"$*\"; }\n" + "elog() { printf ' * %%b\\n' \"$*\" >&2; }\n" + "einfon() { printf ' * %%b' \"$*\" >&2; }\n" "einfo() { elog \"$@\"; }\n" "ewarn() { elog \"$@\"; }\n" "eqawarn() { elog \"QA: \"\"$@\"; }\n" @@ -805,8 +805,8 @@ pkg_run_func_at( "fperms() { local f a=$1; shift; for f in \"$@\"; do chmod $a \"${ED}/${f}\"; done; }\n" /* TODO: This should suppress `die` */ "nonfatal() { \"$@\"; }\n" - "ebegin() { printf ' * %%b ...' \"$*\"; }\n" - "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ] && echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; }\n" + "ebegin() { printf ' * %%b ...' \"$*\" >&2; }\n" + "eend() { local r=${1:-$?}; [ $# -gt 0 ] && shift; [ $r -eq 0 ] && echo ' [ ok ]' || echo \" $* \"'[ !! ]'; return $r; } >&2\n" "dodir() { mkdir -p \"$@\"; }\n" "keepdir() { dodir \"$@\" && touch \"$@\"/.keep_${CATEGORY}_${PN}-${SLOT%%/*}; }\n" /* TODO: This should be fatal upon error */