From 8867479b2712d244dc3fd3829ba6710a0c14ebab Mon Sep 17 00:00:00 2001
From: eldritch horrors <pennae@lix.systems>
Date: Mon, 4 Mar 2024 03:47:11 +0100
Subject: [PATCH] Merge pull request #9056 from aakropotkin/patch-1

Respect `NOCOLOR`

(cherry picked from commit 4b78a66bc5066fab46b4c84a5b85c3839e9d8aab)
Change-Id: I005a13dea6cb33133f7bc59926cbaf5cf51c561a
---
 src/libutil/util.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 5a10c69e2..3b4c181e5 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1515,7 +1515,7 @@ bool shouldANSI()
 {
     return isatty(STDERR_FILENO)
         && getEnv("TERM").value_or("dumb") != "dumb"
-        && !getEnv("NO_COLOR").has_value();
+        && !(getEnv("NO_COLOR").has_value() || getEnv("NOCOLOR").has_value());
 }
 
 std::string filterANSIEscapes(std::string_view s, bool filterAll, unsigned int width)