diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | doc/pacman.conf.5.txt | 3 | ||||
| -rw-r--r-- | etc/pacman.conf.in | 1 | ||||
| -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 |
8 files changed, 4 insertions, 36 deletions
@@ -192,8 +192,8 @@ remove.c and sync.c). The frontend is using a configuration file, usually "/etc/pacman.conf". Some of these options are only useful for the frontend only (mainly the ones used to -control the output like showsize or totaldownload, or the behavior with -cleanmethod and syncfirst). The rest is used to configure the library. +control the output like totaldownload, or the behavior with cleanmethod and +syncfirst). The rest is used to configure the library. [UPGRADE/REMOVE/SYNC] diff --git a/doc/pacman.conf.5.txt b/doc/pacman.conf.5.txt index ca1f8833..75b073cd 100644 --- a/doc/pacman.conf.5.txt +++ b/doc/pacman.conf.5.txt @@ -160,9 +160,6 @@ Options Log action messages through syslog(). This will insert log entries into `{localstatedir}/log/messages` or equivalent. -*ShowSize*:: - Display the size of individual packages for '\--sync' and '\--query' modes. - *UseDelta*:: Download delta files instead of complete packages if possible. Requires the xdelta3 program to be installed. diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in index 1105db94..161d5169 100644 --- a/etc/pacman.conf.in +++ b/etc/pacman.conf.in @@ -30,7 +30,6 @@ Architecture = auto # Misc options (all disabled by default) #UseSyslog -#ShowSize #UseDelta #TotalDownload #CheckSpace 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); } |