moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Remove 'Total Package Size'

Browse Source 
Having 'Total Installed Size' and 'Total Download Size' makes this size
unnecessary.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2007-11-11 14:14:07 -06:00
parent 53fdae9a19
commit a0c908dd0d
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pacman/util.c
View File

@ -334,9 +334,8 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local)
const alpm_list_t *i, *j; const alpm_list_t *i, *j;
alpm_list_t *targets = NULL, *to_remove = NULL; alpm_list_t *targets = NULL, *to_remove = NULL;
/* TODO these are some messy variable names */ /* TODO these are some messy variable names */
unsigned long size = 0, isize = 0, rsize = 0, dispsize = 0, dlsize = 0; unsigned long isize = 0, rsize = 0, dispsize = 0, dlsize = 0;
double mbsize = 0.0, mbisize = 0.0, mbrsize = 0.0, mbdispsize = 0.0, double mbisize = 0.0, mbrsize = 0.0, mbdispsize = 0.0, mbdlsize = 0.0;
mbdlsize = 0.0;
for(i = syncpkgs; i; i = alpm_list_next(i)) { for(i = syncpkgs; i; i = alpm_list_next(i)) {
pmsyncpkg_t *sync = alpm_list_getdata(i); pmsyncpkg_t *sync = alpm_list_getdata(i);
@ -360,7 +359,6 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local)
} }
dispsize = alpm_pkg_get_size(pkg); dispsize = alpm_pkg_get_size(pkg);
size += dispsize;
dlsize += alpm_pkg_download_size(pkg, db_local); dlsize += alpm_pkg_download_size(pkg, db_local);
isize += alpm_pkg_get_isize(pkg); isize += alpm_pkg_get_isize(pkg);
@ -379,7 +377,6 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local)
} }
/* Convert byte sizes to MB */ /* Convert byte sizes to MB */
mbsize = size / (1024.0 * 1024.0);
mbisize = isize / (1024.0 * 1024.0); mbisize = isize / (1024.0 * 1024.0);
mbrsize = rsize / (1024.0 * 1024.0); mbrsize = rsize / (1024.0 * 1024.0);
mbdlsize = dlsize / (1024.0 * 1024.0); mbdlsize = dlsize / (1024.0 * 1024.0);
@ -399,11 +396,10 @@ void display_targets(const alpm_list_t *syncpkgs, pmdb_t *db_local)
list_display(_("Targets:"), targets); list_display(_("Targets:"), targets);
printf("\n"); printf("\n");
printf(_("Total Package Size: %.2f MB\n"), mbsize);
printf(_("Total Download Size: %.2f MB\n"), mbdlsize); printf(_("Total Download Size: %.2f MB\n"), mbdlsize);
/* TODO because all pkgs don't include isize, this is a crude hack */ /* TODO because all pkgs don't include isize, this is a crude hack */
if(mbisize > mbsize) { if(mbisize > mbdlsize) {
printf(_("Total Installed Size: %.2f MB\n"), mbisize); printf(_("Total Installed Size: %.2f MB\n"), mbisize);
} }