summaryrefslogtreecommitdiffstats
path: root/apt-pkg
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:18:28 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-13 10:18:42 +0000
commitd4be59fc2d2984b6119096cd5b32862a40e10e0d (patch)
tree59df10f17acde55867f1a3ee7b3d00edefc92232 /apt-pkg
parentReleasing progress-linux version 2.7.14-0.0~progress7.99u1. (diff)
downloadapt-d4be59fc2d2984b6119096cd5b32862a40e10e0d.tar.xz
apt-d4be59fc2d2984b6119096cd5b32862a40e10e0d.zip
Merging upstream version 2.9.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'apt-pkg')
-rw-r--r--apt-pkg/contrib/progress.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc
index a2c4332..df068e4 100644
--- a/apt-pkg/contrib/progress.cc
+++ b/apt-pkg/contrib/progress.cc
@@ -153,13 +153,15 @@ void OpTextProgress::Done()
{
if (NoUpdate == false && OldOp.empty() == false)
{
- char S[300];
+ char S[300] = {};
if (_error->PendingError() == true)
snprintf(S,sizeof(S),_("%c%s... Error!"),'\r',OldOp.c_str());
- else
+ else if (not _config->FindB("APT::Internal::OpProgress::EraseLines", true))
snprintf(S,sizeof(S),_("%c%s... Done"),'\r',OldOp.c_str());
Write(S);
- cout << endl;
+ // FIXME: apt-cdrom relies on this end of line being printed
+ if (_error->PendingError() || not _config->FindB("APT::Internal::OpProgress::EraseLines", true))
+ cout << endl;
OldOp = string();
}
@@ -200,7 +202,8 @@ void OpTextProgress::Update()
{
snprintf(S,sizeof(S),"\r%s",OldOp.c_str());
Write(S);
- cout << endl;
+ if (_config->FindB("APT::Internal::OpProgress::EraseLines", true))
+ cout << endl;
}
// Print the spinner. Absolute progress shows us a time progress.