diff options
| author | Jakob Gruber <jakob.gruber@gmail.com> | 2011-03-25 00:15:44 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-04-21 00:13:20 +0200 |
| commit | dcb6fb224dd3ac91c08369e9fbff12349b96e545 (patch) | |
| tree | 89b5ebf7c2f73e96db324f6680a86f7c5842d148 /src/pacman | |
| parent | efd8ae483fe587feccd32c90fbee474aa19a5557 (diff) | |
| download | pacman-dcb6fb224dd3ac91c08369e9fbff12349b96e545.tar.gz pacman-dcb6fb224dd3ac91c08369e9fbff12349b96e545.tar.xz | |
Remove ShowSize option
Dan: The commit message originally referenced "VerbosePkgLists", but I'm
going to change the name of the option. In addition, this patch serves
a purpose being standalone- we should really do things like this with
-S --print and hopefully -Q --print in the future.
Signed-off-by: Jakob Gruber <jakob.gruber@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'src/pacman')
| -rw-r--r-- | src/pacman/conf.h | 1 | ||||
| -rw-r--r-- | src/pacman/pacman.c | 3 | ||||
| -rw-r--r-- | src/pacman/query.c | 8 | ||||
| -rw-r--r-- | src/pacman/sync.c | 8 | ||||
| -rw-r--r-- | src/pacman/util.c | 12 |
5 files changed, 2 insertions, 30 deletions
diff --git a/src/pacman/conf.h b/src/pacman/conf.h index bb11bab2..d85f33ee 100644 --- a/src/pacman/conf.h +++ b/src/pacman/conf.h @@ -70,7 +70,6 @@ typedef struct __config_t { /* conf file options */ unsigned short chomp; /* I Love Candy! */ - unsigned short showsize; /* show individual package sizes */ /* When downloading, display the amount downloaded, rate, ETA, and percent * downloaded of the total download list */ unsigned short totaldownload; diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index c5c83d77..db819a7d 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -988,9 +988,6 @@ static int _parse_options(const char *key, char *value, } else if(strcmp(key, "ILoveCandy") == 0) { config->chomp = 1; pm_printf(PM_LOG_DEBUG, "config: chomp\n"); - } else if(strcmp(key, "ShowSize") == 0) { - config->showsize = 1; - pm_printf(PM_LOG_DEBUG, "config: showsize\n"); } else if(strcmp(key, "UseDelta") == 0) { alpm_option_set_usedelta(1); pm_printf(PM_LOG_DEBUG, "config: usedelta\n"); diff --git a/src/pacman/query.c b/src/pacman/query.c index d27044eb..5f751191 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -261,14 +261,6 @@ static int query_search(alpm_list_t *targets) printf("%s", alpm_pkg_get_name(pkg)); } - /* print the package size with the output if ShowSize option set */ - if(!config->quiet && config->showsize) { - /* Convert byte size to MB */ - double mbsize = (double)alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - - printf(" [%.2f MB]", mbsize); - } - if (!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 0b34f045..5e8a8e0f 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -347,14 +347,6 @@ static int sync_search(alpm_list_t *syncs, alpm_list_t *targets) printf("%s", alpm_pkg_get_name(pkg)); } - /* print the package size with the output if ShowSize option set */ - if(!config->quiet && config->showsize) { - /* Convert byte size to MB */ - double mbsize = (double)alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - - printf(" [%.2f MB]", mbsize); - } - if (!config->quiet) { if((grp = alpm_pkg_get_groups(pkg)) != NULL) { alpm_list_t *k; diff --git a/src/pacman/util.c b/src/pacman/util.c index c4773481..cf33dabf 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -540,16 +540,8 @@ void display_targets(const alpm_list_t *pkgs, int install) } isize += alpm_pkg_get_isize(pkg); - /* print the package size with the output if ShowSize option set */ - if(config->showsize) { - double mbsize = (double)alpm_pkg_get_size(pkg) / (1024.0 * 1024.0); - - pm_asprintf(&str, "%s-%s [%.2f MB]", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg), mbsize); - } else { - pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), - alpm_pkg_get_version(pkg)); - } + pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(pkg), + alpm_pkg_get_version(pkg)); targets = alpm_list_add(targets, str); } |