emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_transaction_prepare: set "total-download-size" correctly.

Browse Source 
- It was set only with XBPS_FLAG_DOWNLOAD_ONLY.
- Simplify the logic.

In response to #187 and #230
This commit is contained in:
Juan RP 2020-02-18 08:34:41 +01:00
parent 3ad575178e
commit 1b9dc3cc4d
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lib/transaction_prepare.c
View File

@ -82,17 +82,14 @@ compute_transaction_stats(struct xbps_handle *xhp)
xbps_dictionary_get_cstring_nocopy(obj, "repository", &repo); xbps_dictionary_get_cstring_nocopy(obj, "repository", &repo);
xbps_dictionary_get_bool(obj, "preserve", &preserve); xbps_dictionary_get_bool(obj, "preserve", &preserve);
if (xbps_repository_is_remote(repo) && !xbps_binpkg_exists(xhp, obj)) {
xbps_dictionary_get_uint64(obj, "filename-size", &tsize);
tsize += 512;
dlsize += tsize;
dl_pkgcnt++;
xbps_dictionary_set_bool(obj, "download", true);
}
if (xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) { if (xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
tract = "download";
if (xbps_repository_is_remote(repo) &&
!xbps_binpkg_exists(xhp, obj)) {
xbps_dictionary_get_uint64(obj,
"filename-size", &tsize);
tsize += 512;
dlsize += tsize;
dl_pkgcnt++;
xbps_dictionary_set_bool(obj, "download", true);
}
continue; continue;
} }
@ -107,27 +104,14 @@ compute_transaction_stats(struct xbps_handle *xhp)
rm_pkgcnt++; rm_pkgcnt++;
} }
tsize = 0; if ((strcmp(tract, "install") == 0) || (strcmp(tract, "update") == 0)) {
if ((strcmp(tract, "install") == 0) || /* installed_size from repo */
(strcmp(tract, "update") == 0)) { xbps_dictionary_get_uint64(obj, "installed_size", &tsize);
xbps_dictionary_get_uint64(obj,
"installed_size", &tsize);
instsize += tsize; instsize += tsize;
if (xbps_repository_is_remote(repo) &&
!xbps_binpkg_exists(xhp, obj)) {
xbps_dictionary_get_uint64(obj,
"filename-size", &tsize);
/* signature file: 512 bytes */
tsize += 512;
dlsize += tsize;
instsize += tsize;
dl_pkgcnt++;
xbps_dictionary_set_bool(obj, "download", true);
}
} }
/* /*
* If removing or updating a package, get installed_size * If removing or updating a package, get installed_size
* from pkg's metadata dictionary. * from pkgdb instead.
*/ */
if ((strcmp(tract, "remove") == 0) || if ((strcmp(tract, "remove") == 0) ||
((strcmp(tract, "update") == 0) && !preserve)) { ((strcmp(tract, "update") == 0) && !preserve)) {