diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2019-04-29 20:05:38 +0200 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-04-30 17:40:38 +0200 |
commit | cccef6ca60c2775e918d964fdad1afc1dcad4d0e (patch) | |
tree | 80c39c44bf749e37788748d2485c2ce5a29d6c7b /apt-pkg/acquire.cc | |
parent | 46ef1a3e8c8895c53ff1e4787dc96d4f6c5dba27 (diff) |
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.
Diffstat (limited to 'apt-pkg/acquire.cc')
-rw-r--r-- | apt-pkg/acquire.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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; } } |