From: Michael Vogt <mvo@ubuntu.com>
Date: Wed, 7 May 2014 13:41:54 +0000 (+0200)
Subject: Merge branch 'debian/sid' into bugfix/update-progress-reporting
X-Git-Tag: 1.1.exp1~34^2
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/ff94be47f5dbdcf99cea23fad8c9b992a8e5a67e?hp=-c

Merge branch 'debian/sid' into bugfix/update-progress-reporting
---

ff94be47f5dbdcf99cea23fad8c9b992a8e5a67e
diff --combined apt-private/acqprogress.cc
index adec37405,0f5b53e50..ee6c4536f
--- a/apt-private/acqprogress.cc
+++ b/apt-private/acqprogress.cc
@@@ -170,7 -170,7 +170,7 @@@ bool AcqTextStatus::Pulse(pkgAcquire *O
        ScreenWidth = sizeof(Buffer)-1;
  
     // Put in the percent done
 -   sprintf(S,"%.0f%%",((CurrentBytes + CurrentItems)*100.0)/(TotalBytes+TotalItems));
 +   sprintf(S,"%.0f%%", Percent);
  
     bool Shown = false;
     for (pkgAcquire::Worker *I = Owner->WorkersBegin(); I != 0;
@@@ -267,7 -267,7 +267,7 @@@
     else
        cout << '\r' << BlankLine << '\r' << Buffer << flush;
     if (_config->FindB("Apt::Color", false) == true)
-       cout << _config->Find("APT::Color::Neutral");
+       cout << _config->Find("APT::Color::Neutral") << flush;
  
     memset(BlankLine,' ',strlen(Buffer));
     BlankLine[strlen(Buffer)] = 0;