xbps-install: support XBPS_TRANS_REPLACED

Author: classabbyamp

bin/xbps-install/defs.h

@@ -44,6 +44,7 @@ struct transaction {
 	uint32_t rm_pkgcnt;
 	uint32_t dl_pkgcnt;
 	uint32_t hold_pkgcnt;
+	uint32_t repl_pkgcnt;
 };
 
 /* from transaction.c */

bin/xbps-install/transaction.c

@@ -201,6 +201,8 @@ show_transaction_sizes(struct transaction *trans, int cols)
 	    &trans->rm_pkgcnt);
 	xbps_dictionary_get_uint32(trans->d, "total-hold-pkgs",
 	    &trans->hold_pkgcnt);
+	xbps_dictionary_get_uint32(trans->d, "total-replaced-pkgs",
+	    &trans->repl_pkgcnt);
 
 	if (!print_trans_colmode(trans, cols)) {
 		/*
@@ -242,6 +244,12 @@ show_transaction_sizes(struct transaction *trans, int cols)
 			show_package_list(trans, XBPS_TRANS_HOLD, cols);
 			printf("\n");
 		}
+		if (trans->repl_pkgcnt) {
+			printf("%u package%s will be replaced:\n",
+			    trans->repl_pkgcnt, trans->repl_pkgcnt == 1 ? "" : "s");
+			show_package_list(trans, XBPS_TRANS_REPLACED, cols);
+			printf("\n");
+		}
 	}
 	/*
 	 * Show total download/installed/removed size for all required packages.
@@ -493,12 +501,13 @@ exec_transaction(struct xbps_handle *xhp, unsigned int maxcols, bool yes, bool d
 	 */
 	if ((rv = xbps_transaction_commit(xhp)) == 0) {
 		printf("\n%u downloaded, %u installed, %u updated, "
-		    "%u configured, %u removed, %u on hold.\n",
+		    "%u configured, %u removed, %u on hold, %u replaced.\n",
 		    trans->dl_pkgcnt, trans->inst_pkgcnt,
 		    trans->up_pkgcnt,
 		    trans->cf_pkgcnt + trans->inst_pkgcnt + trans->up_pkgcnt,
 		    trans->rm_pkgcnt,
-		    trans->hold_pkgcnt);
+		    trans->hold_pkgcnt,
+		    trans->repl_pkgcnt);
 	} else {
 		xbps_error_printf("Transaction failed! see above for errors.\n");
 	}

bin/xbps-install/util.c

@@ -122,6 +122,8 @@ ttype2str(xbps_dictionary_t pkgd)
 		return "hold";
 	case XBPS_TRANS_DOWNLOAD:
 		return "download";
+	case XBPS_TRANS_REPLACED:
+		return "replaced";
 	default:
 		return "unknown";
 	}