From fc35b4d7d95b2848db482021df4f4500ac142080 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 15 Apr 2024 18:48:14 +0200 Subject: Only erase OpProgress lines in output version 3.0 While this is an interactive only change that doesn't break parsing someone got unhappy. --- apt-pkg/contrib/progress.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index df068e43a..5f440a749 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -156,12 +156,12 @@ void OpTextProgress::Done() char S[300] = {}; if (_error->PendingError() == true) snprintf(S,sizeof(S),_("%c%s... Error!"),'\r',OldOp.c_str()); - else if (not _config->FindB("APT::Internal::OpProgress::EraseLines", true)) + else if (not _config->FindB("APT::Internal::OpProgress::EraseLines", _config->FindI("APT::Output-Version") >= 30)) snprintf(S,sizeof(S),_("%c%s... Done"),'\r',OldOp.c_str()); Write(S); // FIXME: apt-cdrom relies on this end of line being printed - if (_error->PendingError() || not _config->FindB("APT::Internal::OpProgress::EraseLines", true)) - cout << endl; + if (_error->PendingError() || not _config->FindB("APT::Internal::OpProgress::EraseLines", _config->FindI("APT::Output-Version") >= 30)) + cout << endl; OldOp = string(); } @@ -202,8 +202,8 @@ void OpTextProgress::Update() { snprintf(S,sizeof(S),"\r%s",OldOp.c_str()); Write(S); - if (_config->FindB("APT::Internal::OpProgress::EraseLines", true)) - cout << endl; + if (_config->FindB("APT::Internal::OpProgress::EraseLines", _config->FindI("APT::Output-Version") >= 30)) + cout << endl; } // Print the spinner. Absolute progress shows us a time progress. -- cgit v1.2.3-70-g09d2