diff options
| author | Michael Vogt <mvo@debian.org> | 2014-02-14 22:28:34 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-02-14 22:28:34 +0100 |
| commit | 7d99e17ed33aa2d0c24d067d8bea5101af34fcad (patch) | |
| tree | 26978b890a0faf2fb89bf036f00697c9dfb5e749 /apt-private | |
| parent | f2f53128c01f0620ab21c312cd6601d903aaae3c (diff) | |
| parent | 4c90bc28889b9570096148e18e4433d18ab51a12 (diff) | |
| download | apt-7d99e17ed33aa2d0c24d067d8bea5101af34fcad.tar.gz | |
Merge remote-tracking branch 'donkult/debian/sid' into debian/sid
Conflicts:
apt-private/acqprogress.cc
Diffstat (limited to 'apt-private')
| -rw-r--r-- | apt-private/acqprogress.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc index 3aafea4f2..d25ffef75 100644 --- a/apt-private/acqprogress.cc +++ b/apt-private/acqprogress.cc @@ -35,7 +35,7 @@ AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) { BlankLine[0] = 0; // testcases use it to disable pulses without disabling other user messages - if (_config->FindB("quiet::NoUpdate", false) == true) + if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true) this->Quiet = 1; } /*}}}*/ |