diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2016-03-15 14:50:37 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2016-03-16 17:52:40 +0100 |
| commit | fb193b1cd43f0e8c3b7e5f69f183b9abe7e83761 (patch) | |
| tree | f0ef684a93cf8f18ee95e1b4acc635a6722ac7b4 /apt-pkg/acquire-item.cc | |
| parent | 8e0c56db82fe10b0f8ceadf3187ffc672eaaff3a (diff) | |
Get accurate progress reporting in apt update again
For the non-pdiff case, we have can have accurate progress
reporting because after fetching the {,In}Release files we know
how many IndexFiles will be fetched and what size they have.
Therefore init the filesize early (in pkgAcqIndex::Init) and
ensure that in Acquire::Pulse() looks at already downloaded
bits when calculating the progress in Acquire::Pulse.
Also improve debug output of Debug::acquire::progress
Diffstat (limited to 'apt-pkg/acquire-item.cc')
| -rw-r--r-- | apt-pkg/acquire-item.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 717751a6e..2180a5a41 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -2610,6 +2610,10 @@ void pkgAcqIndex::Init(string const &URI, string const &URIDesc, DestFile = GetPartialFileNameFromURI(URI); NextCompressionExtension(CurrentCompressionExtension, CompressionExtensions, false); + // store file size of the download to ensure the fetcher gives + // accurate progress reporting + FileSize = GetExpectedHashes().FileSize(); + if (CurrentCompressionExtension == "uncompressed") { Desc.URI = URI; |