diff options
| author | morganamilo <morganamilo@archlinux.org> | 2021-01-16 18:12:55 +0100 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2021-01-21 08:20:48 +0100 |
| commit | ab549c846707230e44e2b7e08c6a04d44af916cd (patch) | |
| tree | f06a335ef839d724e4d22c05d4fe468f749393fa /lib/libalpm | |
| parent | b40c5553b43633f4b9bd01310e0ae8ff56147723 (diff) | |
| download | pacman-ab549c846707230e44e2b7e08c6a04d44af916cd.tar.gz pacman-ab549c846707230e44e2b7e08c6a04d44af916cd.tar.xz | |
libalpm: fix total download reporting wrong total
When a package does not need to be downloaded but a signature does,
total download didn't count that towards the total.
Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'lib/libalpm')
| -rw-r--r-- | lib/libalpm/sync.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/libalpm/sync.c b/lib/libalpm/sync.c index 2859debb..c742e395 100644 --- a/lib/libalpm/sync.c +++ b/lib/libalpm/sync.c @@ -755,6 +755,11 @@ static int download_files(alpm_handle_t *handle) cachedir = _alpm_filecache_setup(handle); handle->trans->state = STATE_DOWNLOADING; + ret = find_dl_candidates(handle, &files); + if(ret != 0) { + goto finish; + } + /* Total progress - figure out the total download size if required to * pass to the callback. This function is called once, and it is up to the * frontend to compute incremental progress. */ @@ -762,21 +767,14 @@ static int download_files(alpm_handle_t *handle) off_t total_size = (off_t)0; size_t howmany = 0; /* sum up the download size for each package and store total */ - for(i = handle->trans->add; i; i = i->next) { + for(i = files; i; i = i->next) { alpm_pkg_t *spkg = i->data; total_size += spkg->download_size; - if(spkg->download_size > 0) { - howmany++; - } + howmany++; } handle->totaldlcb(howmany, total_size); } - ret = find_dl_candidates(handle, &files); - if(ret != 0) { - goto finish; - } - if(files) { /* check for necessary disk space for download */ if(handle->checkspace) { |