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

xbps_transaction_prepare: set transd stats correctly.

Browse Source 
- if pkg trans type is UPDATE or REMOVE, don't set
  download stats, we don't need them.
- Simplify code.
This commit is contained in:
Juan RP 2020-02-21 10:39:38 +01:00
parent 06c9891ae3
commit f9ccd9b627
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/transaction_prepare.c
View File

@ -84,7 +84,18 @@ compute_transaction_stats(struct xbps_handle *xhp)
xbps_dictionary_get_bool(obj, "preserve", &preserve); xbps_dictionary_get_bool(obj, "preserve", &preserve);
ttype = xbps_transaction_pkg_type(obj); ttype = xbps_transaction_pkg_type(obj);
if (xbps_repository_is_remote(repo) && !xbps_binpkg_exists(xhp, obj)) { if (ttype == XBPS_TRANS_REMOVE) {
rm_pkgcnt++;
} else if (ttype == XBPS_TRANS_CONFIGURE) {
cf_pkgcnt++;
} else if (ttype == XBPS_TRANS_INSTALL || ttype == XBPS_TRANS_REINSTALL) {
inst_pkgcnt++;
} else if (ttype == XBPS_TRANS_UPDATE) {
up_pkgcnt++;
}
if ((ttype != XBPS_TRANS_CONFIGURE) && (ttype != XBPS_TRANS_REMOVE) &&
xbps_repository_is_remote(repo) && !xbps_binpkg_exists(xhp, obj)) {
xbps_dictionary_get_uint64(obj, "filename-size", &tsize); xbps_dictionary_get_uint64(obj, "filename-size", &tsize);
tsize += 512; tsize += 512;
dlsize += tsize; dlsize += tsize;
@ -94,23 +105,9 @@ compute_transaction_stats(struct xbps_handle *xhp)
if (xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) { if (xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
continue; continue;
} }
/* installed_size from repo */
if (ttype == XBPS_TRANS_CONFIGURE) { xbps_dictionary_get_uint64(obj, "installed_size", &tsize);
cf_pkgcnt++; instsize += tsize;
continue;
} else if (ttype == XBPS_TRANS_INSTALL) {
inst_pkgcnt++;
} else if (ttype == XBPS_TRANS_UPDATE) {
up_pkgcnt++;
} else if (ttype == XBPS_TRANS_REMOVE) {
rm_pkgcnt++;
}
if (ttype == XBPS_TRANS_INSTALL || ttype == XBPS_TRANS_UPDATE) {
/* installed_size from repo */
xbps_dictionary_get_uint64(obj, "installed_size", &tsize);
instsize += tsize;
}
/* /*
* If removing or updating a package without preserve, * If removing or updating a package without preserve,
* get installed_size from pkgdb instead. * get installed_size from pkgdb instead.