honor option to disable pulses for the testcases

Git-Dch: Ignore

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index af2d0f46116d466036d6c12323bccb886655ead9..d25ffef7533c4faf507937120d8861aa497f695a 100644 (file)
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -30,10 +30,13 @@ using namespace std;
 // AcqTextStatus::AcqTextStatus - Constructor                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // 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;
 {
    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                      /*{{{*/
 }
                                                                        /*}}}*/
 // AcqTextStatus::Start - Downloading has started                      /*{{{*/

diff --git a/apt-private/acqprogress.h b/apt-private/acqprogress.h
index e47bfb72ddbdd359ca7d2050e546790ee2102d25..e12dafe5025214334784ec62f53c1c1c1987b47c 100644 (file)
--- a/apt-private/acqprogress.h
+++ b/apt-private/acqprogress.h
@@ -32,7 +32,7 @@ class AcqTextStatus : public pkgAcquireStatus
    
    bool Pulse(pkgAcquire *Owner);
 
    
    bool Pulse(pkgAcquire *Owner);
 

-   AcqTextStatus(unsigned int &ScreenWidth,unsigned int Quiet);
+   AcqTextStatus(unsigned int &ScreenWidth,unsigned int const Quiet);

 };
 
 #endif
 };
 
 #endif

diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index bc3c6dbadf9c76e60bc1efce37f7492c0a6f5d14..b51be244a0005dedfd1a8d0dd733ae25578672e6 100755 (executable)
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -48,5 +48,6 @@ rm https
 cd - >/dev/null
 echo "Dir::Bin::Methods \"${COPYMETHODS}\";" >> aptconfig.conf
 
 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
 testsuccess test ! -e apt_1.0_all.deb