diff options
author | Michael Vogt <mvo@debian.org> | 2014-02-12 09:23:20 +0100 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2014-02-12 09:23:20 +0100 |
commit | 183d522362c95309d70baa418b54096599c17653 (patch) | |
tree | 9f0c12dc542c3ec627d7cc384ec55838ae9e63fc /cmdline/apt.cc | |
parent | ce55512d4924b52c985276c62a0c69ac13e203cd (diff) | |
parent | 8f3594c3487800edc2a97af1f3290049776dc556 (diff) |
Merge remote-tracking branch 'mvo/debian/sid' into debian/sid
Conflicts:
test/integration/test-apt-get-download
Diffstat (limited to 'cmdline/apt.cc')
-rw-r--r-- | cmdline/apt.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmdline/apt.cc b/cmdline/apt.cc index 6fe25e3f3..6ad470faa 100644 --- a/cmdline/apt.cc +++ b/cmdline/apt.cc @@ -156,8 +156,6 @@ int main(int argc, const char *argv[]) /*{{{*/ << std::endl << std::endl; } - if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1) - _config->Set("quiet","1"); // See if the help should be shown if (_config->FindB("help") == true || |