From f9ccd9b6279610c6f8f9ab8a04d52eeb46476d92 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Feb 2020 10:39:38 +0100
Subject: [PATCH] xbps_transaction_prepare: set transd stats correctly.

- if pkg trans type is UPDATE or REMOVE, don't set
  download stats, we don't need them.
- Simplify code.
---
 lib/transaction_prepare.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/lib/transaction_prepare.c b/lib/transaction_prepare.c
index 81a74f9a..e9cae5f0 100644
--- a/lib/transaction_prepare.c
+++ b/lib/transaction_prepare.c
@@ -84,7 +84,18 @@ compute_transaction_stats(struct xbps_handle *xhp)
 		xbps_dictionary_get_bool(obj, "preserve", &preserve);
 		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);
 			tsize += 512;
 			dlsize += tsize;
@@ -94,23 +105,9 @@ compute_transaction_stats(struct xbps_handle *xhp)
 		if (xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
 			continue;
 		}
-
-		if (ttype == XBPS_TRANS_CONFIGURE) {
-			cf_pkgcnt++;
-			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;
-		}
+		/* installed_size from repo */
+		xbps_dictionary_get_uint64(obj, "installed_size", &tsize);
+		instsize += tsize;
 		/*
 		 * If removing or updating a package without preserve,
 		 * get installed_size from pkgdb instead.