respect user pinning in M-A:same version (un)screwing

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

diff --git a/apt-private/acqprogress.cc b/apt-private/acqprogress.cc
index dcc538a3969b4eb168b14244827c178b668df4fc..c182fa02dfd4ebd9379d8595656976e61c4773e1 100644 (file)
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@ -121,24 +121,40 @@ void AcqTextStatus::Fail(pkgAcquire::ItemDesc &Itm)
    AssignItemID(Itm);
    clearLastLine();
 
+   bool ShowErrorText = true;
    if (Itm.Owner->Status == pkgAcquire::Item::StatDone || Itm.Owner->Status == pkgAcquire::Item::StatIdle)
    {
       // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
       // which failed to download, but the error is ignored (compare "Err:")
       ioprintf(out, _("Ign:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
-      if (Itm.Owner->ErrorText.empty() == false &&
-           _config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == true)
-        out << std::endl << "  " << Itm.Owner->ErrorText;
-      out << std::endl;
+      if (Itm.Owner->ErrorText.empty() ||
+           _config->FindB("Acquire::Progress::Ignore::ShowErrorText", false) == false)
+        ShowErrorText = false;
    }
    else
    {
       // TRANSLATOR: Very short word to be displayed for files in 'apt-get update'
       // which failed to download and the error is critical (compare "Ign:")
       ioprintf(out, _("Err:%lu %s"), Itm.Owner->ID, Itm.Description.c_str());
-      out << std::endl << "  " << Itm.Owner->ErrorText << std::endl;
    }
 
+   if (ShowErrorText)
+   {
+      std::string::size_type line_start = 0;
+      std::string::size_type line_end;
+      while ((line_end = Itm.Owner->ErrorText.find_first_of("\n\r", line_start)) != std::string::npos) {
+        out << std::endl << "  " << Itm.Owner->ErrorText.substr(line_start, line_end - line_start);
+        line_start = Itm.Owner->ErrorText.find_first_not_of("\n\r", line_end + 1);
+        if (line_start == std::string::npos)
+           break;
+      }
+      if (line_start == 0)
+        out << std::endl << "  " << Itm.Owner->ErrorText;
+      else if (line_start != std::string::npos)
+        out << std::endl << "  " << Itm.Owner->ErrorText.substr(line_start);
+   }
+   out << std::endl;
+
    Update = true;
 }
                                                                        /*}}}*/
@@ -176,8 +192,6 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
    if (Quiet > 0)
       return true;
 
-   enum {Long = 0,Medium,Short} Mode = Medium;
-
    std::string Line;
    {
       std::stringstream S;
@@ -203,6 +217,7 @@ bool AcqTextStatus::Pulse(pkgAcquire *Owner)
         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;