From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1491783-garchives=archives.gentoo.org@lists.gentoo.org>
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 ADBB5158030
for <garchives@archives.gentoo.org>; Wed, 1 Mar 2023 21:00:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id D0B44E076B;
Wed, 1 Mar 2023 21:00:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.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 98F07E076B
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Mar 2023 21:00:29 +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 A6D583407AF
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Mar 2023 21:00:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0C233531
for <gentoo-commits@lists.gentoo.org>; Wed, 1 Mar 2023 21:00:27 +0000 (UTC)
From: "Fabian Groffen" <grobian@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org>
Message-ID: <1677704364.5f5f6983b159b970ad619c4ef53d4b94361d1b5d.grobian@gentoo>
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
X-VCS-Repository: proj/portage-utils
X-VCS-Files: main.c
X-VCS-Directories: /
X-VCS-Committer: grobian
X-VCS-Committer-Name: Fabian Groffen
X-VCS-Revision: 5f5f6983b159b970ad619c4ef53d4b94361d1b5d
X-VCS-Branch: master
Date: Wed, 1 Mar 2023 21:00:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: cff33cf3-a303-4d5e-a22e-293c722d57e0
X-Archives-Hash: 7d244b0803203a0e22639ea666b422ef
commit: 5f5f6983b159b970ad619c4ef53d4b94361d1b5d
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 1 20:59:24 2023 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Wed Mar 1 20:59:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=5f5f6983
main: support NO_COLOR environment variable
NO_COLOR apparently is the more standard version of NOCOLOR.
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
main.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/main.c b/main.c
index b22d6f4..111d7ec 100644
--- a/main.c
+++ b/main.c
@@ -1052,6 +1052,12 @@ initialize_portage_env(void)
set_portage_env_var(var, s, var->name);
}
+ /* special snowflake, NO_COLOR is apparently some standard now,
+ * accept it (as override of NOCOLOR) */
+ s = getenv("NO_COLOR");
+ if (s != NULL)
+ set_portage_env_var(&vars_to_read[7], s, "NO_COLOR");
+
/* expand any nested variables e.g. PORTDIR=${EPREFIX}/usr/portage */
for (i = 0; vars_to_read[i].name; ++i) {
char *svar;