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

xbps-install: only print num of downloaded pkgs with -D.

Browse Source
This commit is contained in:
Juan RP 2019-06-21 16:26:08 +02:00
parent f1181c7415
commit 13172c22fc
No known key found for this signature in database
GPG Key ID: AF19F6CB482F9368
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/xbps-install/transaction.c
View File

@ -125,16 +125,6 @@ show_transaction_sizes(struct transaction *trans, int cols)
uint64_t dlsize = 0, instsize = 0, rmsize = 0, disk_free_size = 0;
char size[8];
if (trans->xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
xbps_dictionary_get_uint32(trans->d, "total-download-pkgs",
&trans->dl_pkgcnt);
trans->inst_pkgcnt = 0;
trans->up_pkgcnt = 0;
trans->cf_pkgcnt = 0;
trans->rm_pkgcnt = 0;
goto out;
}
if (!print_trans_colmode(trans, cols)) {
/*
* Show the list of packages that will be downloaded, installed, updated,
@ -148,6 +138,14 @@ show_transaction_sizes(struct transaction *trans, int cols)
show_package_list(trans, NULL, cols);
printf("\n");
}
if (trans->xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
trans->inst_pkgcnt = 0;
trans->up_pkgcnt = 0;
trans->cf_pkgcnt = 0;
trans->rm_pkgcnt = 0;
goto out;
}
xbps_dictionary_get_uint32(trans->d, "total-install-pkgs",
&trans->inst_pkgcnt);
if (trans->inst_pkgcnt) {
@ -189,6 +187,7 @@ out:
xbps_dictionary_get_uint64(trans->d, "total-installed-size", &instsize);
xbps_dictionary_get_uint64(trans->d, "total-removed-size", &rmsize);
xbps_dictionary_get_uint64(trans->d, "disk-free-size", &disk_free_size);
if (dlsize || instsize || rmsize || disk_free_size)
printf("\n");

6
bin/xbps-install/util.c
View File

@ -147,6 +147,12 @@ print_trans_colmode(struct transaction *trans, int cols)
} else if (strcmp(tract, "configure") == 0) {
trans->cf_pkgcnt++;
}
if (trans->xhp->flags & XBPS_FLAG_DOWNLOAD_ONLY) {
trans->inst_pkgcnt = 0;
trans->up_pkgcnt = 0;
trans->rm_pkgcnt = 0;
trans->cf_pkgcnt = 0;
}
if (dload) {
trans->dl_pkgcnt++;
}