Browse Source

honor option to disable pulses for the testcases

Git-Dch: Ignore
debian/1.8.y
David Kalnischkies 9 years ago
parent
commit
18cce3980f
  1. 7
      apt-private/acqprogress.cc
  2. 2
      apt-private/acqprogress.h
  3. 3
      test/integration/test-bug-738785-switch-protocol

7
apt-private/acqprogress.cc

@ -30,10 +30,13 @@ using namespace std;
// AcqTextStatus::AcqTextStatus - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet) :
ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
AcqTextStatus::AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet) :
pkgAcquireStatus(), ScreenWidth(ScreenWidth), ID(0), Quiet(Quiet)
{
BlankLine[0] = 0;
// testcases use it to disable pulses without disabling other user messages
if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
this->Quiet = 1;
}
/*}}}*/
// AcqTextStatus::Start - Downloading has started /*{{{*/

2
apt-private/acqprogress.h

@ -32,7 +32,7 @@ class AcqTextStatus : public pkgAcquireStatus
bool Pulse(pkgAcquire *Owner);
AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet);
};
#endif

3
test/integration/test-bug-738785-switch-protocol

@ -48,5 +48,6 @@ rm https
cd - >/dev/null
echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf
aptget download apt
testequal "E: The method driver $(pwd)/rootdir/usr/lib/apt/methods/https could not be found.
N: Is the package apt-transport-https installed?" aptget download apt -q=0
testsuccess test ! -e apt_1.0_all.deb

Loading…
Cancel
Save