summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apt-private/private-cmndline.cc3
-rw-r--r--apt-private/private-output.cc2
2 files changed, 3 insertions, 2 deletions
diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc
index 2884dccba..9af241947 100644
--- a/apt-private/private-cmndline.cc
+++ b/apt-private/private-cmndline.cc
@@ -474,7 +474,8 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/
std::string const binary = flNotDir(Binary);
if (binary == "apt" || binary == "apt-config")
{
- _config->CndSet("Binary::apt::APT::Color", true);
+ if (getenv("NO_COLOR") == nullptr)
+ _config->CndSet("Binary::apt::APT::Color", true);
_config->CndSet("Binary::apt::APT::Cache::Show::Version", 2);
_config->CndSet("Binary::apt::APT::Cache::AllVersions", false);
_config->CndSet("Binary::apt::APT::Cache::ShowVirtuals", true);
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index d07ecc0ce..daa6c6aed 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -86,7 +86,7 @@ bool InitOutput(std::basic_streambuf<char> * const out) /*{{{*/
SigWinch(0);
}
- if(!isatty(1))
+ if(!isatty(1) || getenv("NO_COLOR") != nullptr)
{
_config->Set("APT::Color", "false");
_config->Set("APT::Color::Highlight", "");