Release 1.1.10

[apt.git] / apt-private / acqprogress.cc

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index f6c3d1204ac8feab6441b0634ab0e7bbdbc084ff..a33d51c7178d60d631586c03f768d2c46ed74dcf 100644 (file)
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -37,6 +37,8 @@ AcqTextStatus::AcqTextStatus(std::ostream &out, unsigned int &ScreenWidth,unsign
    // testcases use it to disable pulses without disabling other user messages
    if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
       this->Quiet = 1;
    // testcases use it to disable pulses without disabling other user messages
    if (Quiet == 0 && _config->FindB("quiet::NoUpdate", false) == true)
       this->Quiet = 1;

+   if (Quiet < 2 && _config->FindB("quiet::NoProgress", false) == true)
+      this->Quiet = 2;

 }
                                                                        /*}}}*/
 // AcqTextStatus::Start - Downloading has started                      /*{{{*/
 }
                                                                        /*}}}*/
 // AcqTextStatus::Start - Downloading has started                      /*{{{*/


@@ -174,8 +176,6 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    if (Quiet > 0)
       return true;
 
    if (Quiet > 0)
       return true;
 

-   enum {Long = 0,Medium,Short} Mode = Medium;
-

    std::string Line;
    {
       std::stringstream S;
    std::string Line;
    {
       std::stringstream S;


@@ -201,6 +201,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
         if (I->CurrentItem->Owner->ActiveSubprocess.empty() == false)
            S << " " << I->CurrentItem->Owner->ActiveSubprocess;
 
         if (I->CurrentItem->Owner->ActiveSubprocess.empty() == false)
            S << " " << I->CurrentItem->Owner->ActiveSubprocess;
 

+        enum {Long = 0,Medium,Short} Mode = Medium;

         // Add the current progress
         if (Mode == Long)
            S << " " << I->CurrentSize;
         // Add the current progress
         if (Mode == Long)
            S << " " << I->CurrentSize;


@@ -296,7 +297,7 @@ bool AcqTextStatus::MediaChange(std::string Media, std::string Drive)
    clearLastLine();
    ioprintf(out,_("Media change: please insert the disc labeled\n"
                   " '%s'\n"
    clearLastLine();
    ioprintf(out,_("Media change: please insert the disc labeled\n"
                   " '%s'\n"

-                  "in the drive '%s' and press enter\n"),
+                  "in the drive '%s' and press [Enter]\n"),

            Media.c_str(),Drive.c_str());
 
    char C = 0;
            Media.c_str(),Drive.c_str());
 
    char C = 0;