summaryrefslogtreecommitdiff
path: root/apt-private
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2014-02-13 14:29:20 +0100
committerMichael Vogt <mvo@debian.org>2014-02-13 14:29:20 +0100
commit784e35e86293094bb5c1456c8f9c844df2a71f12 (patch)
tree28073f068ca09c46c04a5ed9e047824f782b15ac /apt-private
parenta84a4d2ab78c498d9797c07d463daec4095b37de (diff)
parent28b4b983d95fa742a5431547285a748e8b856399 (diff)
Merge branch 'debian/sid' into ubuntu/master
Conflicts: configure.ac debian/changelog
Diffstat (limited to 'apt-private')
-rw-r--r--apt-private/private-output.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/apt-private/private-output.cc b/apt-private/private-output.cc
index 2ae112af4..420ca14d5 100644
--- a/apt-private/private-output.cc
+++ b/apt-private/private-output.cc
@@ -30,6 +30,9 @@ unsigned int ScreenWidth = 80 - 1; /* - 1 for the cursor */
bool InitOutput() /*{{{*/
{
+ if (!isatty(STDOUT_FILENO) && _config->FindI("quiet", -1) == -1)
+ _config->Set("quiet","1");
+
c0out.rdbuf(cout.rdbuf());
c1out.rdbuf(cout.rdbuf());
c2out.rdbuf(cout.rdbuf());