From cccef6ca60c2775e918d964fdad1afc1dcad4d0e Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 29 Apr 2019 20:05:38 +0200 Subject: acq: worker: Move CurrentSize, TotalSize, ResumePoint to CurrentItem These status fields belong to the current item, move them there. This prepares us for eventually having multiple current items. --- apt-pkg/acquire.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'apt-pkg/acquire.cc') diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc index 3abebc8d4..87bb13e39 100644 --- a/apt-pkg/acquire.cc +++ b/apt-pkg/acquire.cc @@ -1284,13 +1284,13 @@ bool pkgAcquireStatus::Pulse(pkgAcquire *Owner) { if (I->CurrentItem != 0 && I->CurrentItem->Owner->Complete == false) { - CurrentBytes += I->CurrentSize; - ResumeSize += I->ResumePoint; + CurrentBytes += I->CurrentItem->CurrentSize; + ResumeSize += I->CurrentItem->ResumePoint; // Files with unknown size always have 100% completion if (I->CurrentItem->Owner->FileSize == 0 && I->CurrentItem->Owner->Complete == false) - TotalBytes += I->CurrentSize; + TotalBytes += I->CurrentItem->CurrentSize; } } -- cgit v1.2.3