summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2010-06-26 19:04:20 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2010-06-26 19:04:20 +0200
commitc340d1851242e691e7e0baad18a662d6c7a62bc8 (patch)
treef4a29b7437cf44a9ea8109e80b0ce0c7dcb1a7cf
parent5afa55c6703a71a198aac950db30ffc6ca49f269 (diff)
do not override the user set quiet setting even if the target is not a tty
-rw-r--r--cmdline/apt-cache.cc2
-rw-r--r--cmdline/apt-cdrom.cc2
-rw-r--r--cmdline/apt-get.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmdline/apt-cache.cc b/cmdline/apt-cache.cc
index a4ec63eed..a5b3141d7 100644
--- a/cmdline/apt-cache.cc
+++ b/cmdline/apt-cache.cc
@@ -1868,7 +1868,7 @@ int main(int argc,const char *argv[]) /*{{{*/
}
// Deal with stdout not being a tty
- if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
+ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
// if (_config->FindB("APT::Cache::Generate",true) == false)
diff --git a/cmdline/apt-cdrom.cc b/cmdline/apt-cdrom.cc
index da2ffa390..d1268edf9 100644
--- a/cmdline/apt-cdrom.cc
+++ b/cmdline/apt-cdrom.cc
@@ -266,7 +266,7 @@ int main(int argc,const char *argv[]) /*{{{*/
return ShowHelp();
// Deal with stdout not being a tty
- if (isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
+ if (isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
// Match the operation
diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc
index 605eedb0f..e3477b6db 100644
--- a/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@ -2899,7 +2899,7 @@ int main(int argc,const char *argv[]) /*{{{*/
}
// Deal with stdout not being a tty
- if (!isatty(STDOUT_FILENO) && _config->FindI("quiet",0) < 1)
+ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
_config->Set("quiet","1");
// Setup the output streams