- Pacman-dev - lists.archlinux.org

[pacman-dev] [GIT] The official pacman repository branch, maint, updated. v4.1.1-7-g7d2c7fb
by allan＠archlinux.org 29 May '13

29 May '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, maint has been updated via 7d2c7fb347e8b5ea89127f3f8b4a545772394600 (commit) via d235f541143026aa59d012d7083a41c43a622eeb (commit) via 8335e169a6f38c288db4249c3d272a9ced332580 (commit) via 1ed881fed31952c65f9606df5e265c36221974e9 (commit) via 090c4006d748e0ec50b74e974b4f1fa6f3d6c1ec (commit) via 8be08f7cae8257af6866febc9d2a57d8d8601a51 (commit) via 72c6d19d64a89a5ad0d162fc0bb6517ea80fc252 (commit) from a4a7336dff8155cfeb37341d1e9e56092439bae6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7d2c7fb347e8b5ea89127f3f8b4a545772394600 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Tue May 28 15:58:00 2013 +0200 Fix various typos in NEWS imporve -> improve diskspace -> disk space BTRFS -> Btrfs filelists -> file lists filesize -> file size Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit d235f541143026aa59d012d7083a41c43a622eeb Author: Allan McRae <allan(a)archlinux.org> Date: Sun May 19 22:53:06 2013 +1000 Remove incorrect bug number from NEWS The wrong bug number is mentioned in commit 32327dc8 and this was perpetuated into the NEWS file. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8335e169a6f38c288db4249c3d272a9ced332580 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 23:11:41 2013 +1000 makepkg: Use LOGDEST for logpipe If LOGDEST is set, we may not check that $startdir is writable. Store the log pipe in LOGDEST instead. Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 1ed881fed31952c65f9606df5e265c36221974e9 Author: Allan McRae <allan(a)archlinux.org> Date: Sat May 18 22:43:12 2013 +1000 Fix comment typo Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 090c4006d748e0ec50b74e974b4f1fa6f3d6c1ec Author: William Giokas <1007380(a)gmail.com> Date: Wed May 15 11:25:58 2013 -0500 contrib: Remove harcoded /etc/pacman.conf Signed-off-by: William Giokas <1007380(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 8be08f7cae8257af6866febc9d2a57d8d8601a51 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 15 09:58:43 2013 -0400 Revert "paccache: avoid subshell in calling runcmd" su is terribad. In addition to reverting, this also removes support for privilege escalation via su. If you want to use paccache as root and fail to comprehend how much better sudo is than su, then run paccache directly via su. Fixes FS#35173. This reverts commit 597286eb258f841dfc00f65474138fc6192f0092. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 72c6d19d64a89a5ad0d162fc0bb6517ea80fc252 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed May 15 09:58:42 2013 -0400 makepkg: fixup broken revision and repo references bzr support "worked", but didn't handle any of the actual features we wanted with makepkg. This moves the revision specification to the proper place (extraction, rather than download), and fixes an additional broken reference to $repo which was never set. Fixes FS#35281. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> Signed-off-by: Allan McRae <allan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: NEWS | 22 +++++++++++----------- contrib/checkupdates.sh.in | 2 +- contrib/paccache.sh.in | 7 +++---- lib/libalpm/deps.c | 2 +- scripts/makepkg.sh.in | 38 +++++++++++++++++++------------------- 5 files changed, 35 insertions(+), 36 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Fix various typos in NEWS
by Jason St. John 29 May '13

29 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> imporve -> improve diskspace -> disk space BTRFS -> Btrfs filelists -> file lists filesize -> file size Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- NEWS | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/NEWS b/NEWS index 6fdb5d5..d3c1548 100644 --- a/NEWS +++ b/NEWS @@ -5,7 +5,7 @@ VERSION DESCRIPTION - various translation fixes and updates (FS#34395, FS#34704, FS#34716, FS#35097) - makepkg: - - imporve SVN VCS PKGBUILD handling (FS#34675, FS#34636) + - improve SVN VCS PKGBUILD handling (FS#34675, FS#34636) - allow "lp:" URLs for BZR sources (FS#34650) - prevent pkgver() capturing stderr (FS#34974) - fix attempt to remove package twice on failure (FS#34672) @@ -30,7 +30,7 @@ VERSION DESCRIPTION - configure shell for running install scriptlets (FS#20557) - make path to ldconfig configurable - display repo in VerbosePkgLists output (FS#26334) - - do not check file conflicts or diskspace with --dbonly + - do not check file conflicts or disk space with --dbonly (FS#25667) - UseDelta takes a ratio for the largest delta to use - track how installed packages were validated (FS#28040) @@ -94,14 +94,14 @@ VERSION DESCRIPTION - use full delta size as max download size (FS#28345) - improved handling and fix crash after failed downloads - fix key lookup when using gpg 2.X as GPG program - - match only full path components in diskspace checking - - skip diskspace checks when using --dbonly + - match only full path components in disk space checking + - skip disk space checks when using --dbonly - scripts: unset CDPATH bash variable in all scripts - makepkg: - fix syntax error in remove_deps (FS#28448) - small fixes related to multiple libdeps, parsing issues - exit via default handler in trap_exit (FS#28491) - - attempt to work around BTRFS file/block size reporting issues + - attempt to work around Btrfs file/block size reporting issues - pacman-key: - remove signature verification in --populate - make -e option work as advertised without arguments @@ -177,8 +177,8 @@ VERSION DESCRIPTION - split package verification and load stages - sync database reading refactor for performance - use a larger buffer for package checksum validation - - filelists now have a dedicated type with metadata - - diskspace check no longer requires iterating package archives + - file lists now have a dedicated type with metadata + - disk space check no longer requires iterating package archives - update and add checksum routines from PolarSSL - validate sync database sha256sum if available - correctly parse sizes in database > 2GiB @@ -240,7 +240,7 @@ VERSION DESCRIPTION - fix default path substitution in documentation - makepkg: quote variables that may contain spaces (FS#24002) - makepkg: fix creation of source package with -p (FS#24567) - - repo-add: include dotfiles in filelists (FS#24534) + - repo-add: include dotfiles in file lists (FS#24534) - minor translation updates: de, fi, fr, sk, zh_CN 3.5.2 - ensure we show correct missing dependency info (FS#23424) - pacman usage/--help updates (FS#23433, FS#23369) @@ -387,7 +387,7 @@ VERSION DESCRIPTION - translations: - zh_CN: fix positional parameter usage in makepkg (FS#16983) - el: fix Y/N response translation (FS#16568) -3.3.2 - fix infinite filesize download issue (FS#16359) +3.3.2 - fix infinite file size download issue (FS#16359) - fix bogus download size on TotalDownload - documentation updates - small translation updates @@ -658,7 +658,7 @@ VERSION DESCRIPTION - conflicts checking speedups and fixes - move lockfile location to inside the DB - remove gettext calls from DEBUG messages - - remove faulty diskspace checking + - remove faulty disk space checking - move functions out of alpm.c to where they belong - rewrite of file extraction code (FS#7484) - makepkg-specific changes: -- 1.8.3

2 1

[pacman-dev] [PATCH] Update example PKGBUILD
by Jason St. John 29 May '13

29 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> Update doc/PKGBUILD-example.txt with several changes from the official Arch Linux package for patch-2.7.1-1, including other changes shown below: -- replaces spaces with tabs in functions -- replaces 'make prefix=' with 'make DESTDIR=' -- improves quoting of the "cd" command in functions Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission requested by Allan that simplifies the PKGBUILD. doc/PKGBUILD-example.txt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 00dd8b1..910fd06 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -1,24 +1,27 @@ # Maintainer: Joe User <joe.user(a)example.com> pkgname=patch -pkgver=2.5.4 -pkgrel=3 +pkgver=2.7.1 +pkgrel=1 pkgdesc="A utility to apply patch files to original sources" arch=('i686' 'x86_64') url="https://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') -depends=('glibc' 'ed') -source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') +depends=('glibc') +makedepends=('ed') +optdepends=('ed: for "patch -e" functionality') +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig}) +md5sums=('e9ae5393426d3ad783a300a338c09b72' + 'SKIP') build() { - cd "$srcdir"/$pkgname-$pkgver - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } package() { - cd "$srcdir"/$pkgname-$pkgver - make prefix="$pkgdir"/usr install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } -- 1.8.3

2 1

[pacman-dev] [PATCH 1/2] Quote sources in PKGBUILD prototypes and example PKGBUILD
by Jason St. John 28 May '13

28 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- Resubmission containing Allan's requested change to PKGBUILD-example.txt doc/PKGBUILD-example.txt | 2 +- proto/PKGBUILD-split.proto | 4 ++-- proto/PKGBUILD.proto | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc/PKGBUILD-example.txt b/doc/PKGBUILD-example.txt index 9ab5dff..00dd8b1 100644 --- a/doc/PKGBUILD-example.txt +++ b/doc/PKGBUILD-example.txt @@ -9,7 +9,7 @@ url="https://www.gnu.org/software/patch/patch.html" license=('GPL') groups=('base-devel') depends=('glibc' 'ed') -source=(ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz) +source=("ftp://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz") md5sums=('ee5ae84d115f051d87fcaaef3b4ae782') build() { diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 672e7df..54e5557 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgbase-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index d4c01b8..5b854ce 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' -- 1.8.3

2 2

[pacman-dev] [PATCH] Quote sources in PKGBUILD prototypes
by Jason St. John 28 May '13

28 May '13

From: "Jason St. John" <jstjohn(a)purdue.edu> --- Does this require further explanation? proto/PKGBUILD-split.proto | 4 ++-- proto/PKGBUILD.proto | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index 672e7df..54e5557 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgbase-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgbase-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index d4c01b8..5b854ce 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -24,8 +24,8 @@ backup=() options=() install= changelog= -source=($pkgname-$pkgver.tar.gz - $pkgname-$pkgver.patch) +source=("$pkgname-$pkgver.tar.gz" + "$pkgname-$pkgver.patch") noextract=() md5sums=() #generate with 'makepkg -g' -- 1.8.3

2 1

[pacman-dev] XferCommand substitutions and quoting
by Xyne 27 May '13

27 May '13

Hi, The commented XferCommands in the default pacman.conf lack proper quoting. Would you please add single quotes around the place holders "%u" and "%o"? Thanks. Regards, Xyne

2 3

[pacman-dev] [PATCH] Indicate ignored packages in -Qu output
by Allan McRae 23 May '13

23 May '13

Add "[ignored]" after packages that have their upgrades ignored in the pacman -Qu output. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- src/pacman/query.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index f051571..2f336d6 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -387,8 +387,17 @@ static int display(alpm_pkg_t *pkg) && !config->op_q_changelog && !config->op_q_check) { if(!config->quiet) { const colstr_t *colstr = &config->colstr; - printf("%s%s %s%s%s\n", colstr->title, alpm_pkg_get_name(pkg), - colstr->version, alpm_pkg_get_version(pkg), colstr->nocolor); + const char *pkgname = alpm_pkg_get_name(pkg); + const char *pkgver = alpm_pkg_get_version(pkg); + + if(config->op_q_upgrade && + alpm_list_find_str(alpm_option_get_ignorepkgs(config->handle), pkgname)) { + printf("%s%s %s%s%s %s\n", colstr->title, pkgname, colstr->version, + pkgver, colstr->nocolor, _("[ignored]")); + } else { + printf("%s%s %s%s%s\n", colstr->title, pkgname, colstr->version, + pkgver, colstr->nocolor); + } } else { printf("%s\n", alpm_pkg_get_name(pkg)); } -- 1.8.2.3

2 1

[pacman-dev] Feature Request: line buffering for stdout/stderr even when they're not tty
by Damjan Georgievski 22 May '13

22 May '13

I wanted to make some analysis of the output of -Qkk and wanted to pipe both stdout and stderr to a grep pipeline pacman -Qkk 2>&1 | ... but it seems when stdout/stderr is not a tty pacman (or some lib) started using bigger, not line oriented buffers so the output got badly interwoven. -- damjan

4 3

[pacman-dev] [PATCH] makepkg-template: Stop using given/when
by Florian Pritz 22 May '13

22 May '13

given/when has been marked experimental in perl 5.18 because it will change it 5.20. if/else is ugly, but hiding the generated warning is no good solution either, so we us if/else for now. Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- scripts/makepkg-template.pl.in | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/scripts/makepkg-template.pl.in b/scripts/makepkg-template.pl.in index 6997a83..7e37799 100755 --- a/scripts/makepkg-template.pl.in +++ b/scripts/makepkg-template.pl.in @@ -120,21 +120,15 @@ sub process_file { if ($line =~ $template_marker) { my $values = parse_template_line($line, $filename, $linenumber); - given ($values->{command}) { - when (['start', 'input']) { - if ($nesting_level == 0) { - $ret .= load_template($values); - } - } - - when ('end') { - # nothing to do here, just for completeness - } - - default { - die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}), - "$filename:$linenumber: $line"; + if ($values->{command} eq "start" or $values->{command} eq "input") { + if ($nesting_level == 0) { + $ret .= load_template($values); } + } elsif ($values->{command} eq "end") { + # nothing to do here, just for completeness + } else { + die sprintf(gettext("Unknown template marker '%s'\n"), $values->{command}), + "$filename:$linenumber: $line"; } $nesting_level++ if $values->{command} eq "start"; -- 1.8.2.3

1 0

[pacman-dev] [PATCH] Improve and colourize VerbosePkgList
by Simon Gomizelj 22 May '13

22 May '13

Improve VerbosePkgList by caching attributes then and cell's length with the cell's label instead of recalculating. Right align every cell that containing a file size, not just the last collumn. Simplify printf statements and the alignment application. Signed-off-by: Simon Gomizelj <simongmzlj(a)gmail.com> --- src/pacman/util.c | 135 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 60 deletions(-) diff --git a/src/pacman/util.c b/src/pacman/util.c index 862c8e8..70a76b8 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -52,6 +52,18 @@ struct table_row_t { int size; }; +struct verbose_cell_t { + char *label; + size_t len; + int mode; +}; + +enum { + CELL_NORMAL = 0, + CELL_TITLE = 1, + CELL_RIGHT_ALIGN = 1 << 2 +}; + int trans_init(alpm_transflag_t flags, int check_valid) { int ret; @@ -424,6 +436,35 @@ static size_t string_length(const char *s) return len; } +static void add_verbose_cell(alpm_list_t **row, char *label, int mode) +{ + struct verbose_cell_t *cell = malloc(sizeof(struct verbose_cell_t)); + + cell->label = label; + cell->mode = mode; + cell->len = string_length(label); + + *row = alpm_list_add(*row, cell); +} + +static void free_verbose_cell(void *ptr) +{ + struct verbose_cell_t *cell = ptr; + + free(cell->label); + free(cell); +} + +static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) +{ + struct table_row_t *row = malloc(sizeof(struct table_row_t)); + + row->label = label; + row->size = size; + + *table = alpm_list_add(*table, row); +} + void string_display(const char *title, const char *string, unsigned short cols) { if(title) { @@ -442,43 +483,30 @@ void string_display(const char *title, const char *string, unsigned short cols) static void table_print_line(const alpm_list_t *line, short col_padding, size_t colcount, size_t *widths, int *has_data) { - size_t i, lastcol = 0; + size_t i; int need_padding = 0; const alpm_list_t *curcell; - for(i = colcount; i > 0; i--) { - if(has_data[i - 1]) { - lastcol = i - 1; - break; - } - } - for(i = 0, curcell = line; curcell && i < colcount; i++, curcell = alpm_list_next(curcell)) { - const char *value; + const struct verbose_cell_t *cell = curcell->data; + const char *str = (cell->label ? cell->label : ""); int cell_padding; if(!has_data[i]) { continue; } - value = curcell->data; - if(!value) { - value = ""; - } - /* silly printf requires padding size to be an int */ - cell_padding = (int)widths[i] - (int)string_length(value); - if(cell_padding < 0) { - cell_padding = 0; - } + cell_padding = (cell->mode & CELL_RIGHT_ALIGN ? (int)widths[i] : -(int)widths[i]); + if(need_padding) { printf("%*s", col_padding, ""); } - /* left-align all but the last column */ - if(i != lastcol) { - printf("%s%*s", value, cell_padding, ""); + + if(cell->mode & CELL_TITLE) { + printf("%s%*s%s", config->colstr.title, cell_padding, str, config->colstr.nocolor); } else { - printf("%*s%s", cell_padding, "", value); + printf("%*s", cell_padding, str); } need_padding = 1; } @@ -487,7 +515,6 @@ static void table_print_line(const alpm_list_t *line, short col_padding, } - /** * Find the max string width of each column. Also determines whether values * exist in the column and sets the value in has_data accordingly. @@ -522,7 +549,8 @@ static size_t table_calc_widths(const alpm_list_t *header, } /* header determines column count and initial values of longest_strs */ for(i = header, curcol = 0; i; i = alpm_list_next(i), curcol++) { - colwidths[curcol] = string_length(i->data); + const struct verbose_cell_t *row = i->data; + colwidths[curcol] = row->len; /* note: header does not determine whether column has data */ } @@ -531,8 +559,8 @@ static size_t table_calc_widths(const alpm_list_t *header, /* grab first column of each row and iterate through columns */ const alpm_list_t *j = i->data; for(curcol = 0; j; j = alpm_list_next(j), curcol++) { - const char *str = j->data; - size_t str_len = string_length(str); + const struct verbose_cell_t *row = j->data; + size_t str_len = row ? row->len : 0; if(str_len > colwidths[curcol]) { colwidths[curcol] = str_len; @@ -597,11 +625,10 @@ static int table_display(const char *title, const alpm_list_t *header, } if(title != NULL) { - printf("%s\n\n", title); + printf("%s%s%s\n\n", config->colstr.title, title, config->colstr.nocolor); } table_print_line(header, padding, totalcols, widths, has_data); - printf("\n"); for(i = rows; i; i = alpm_list_next(i)) { table_print_line(i->data, padding, totalcols, widths, has_data); @@ -761,21 +788,15 @@ void signature_display(const char *title, alpm_siglist_t *siglist, /* creates a header row for use with table_display */ static alpm_list_t *create_verbose_header(void) { - alpm_list_t *res = NULL; - char *str; + alpm_list_t *ret = NULL; - str = _("Name"); - res = alpm_list_add(res, str); - str = _("Old Version"); - res = alpm_list_add(res, str); - str = _("New Version"); - res = alpm_list_add(res, str); - str = _("Net Change"); - res = alpm_list_add(res, str); - str = _("Download Size"); - res = alpm_list_add(res, str); - - return res; + add_verbose_cell(&ret, _("Name"), CELL_TITLE); + add_verbose_cell(&ret, _("Old Version"), CELL_TITLE); + add_verbose_cell(&ret, _("New Version"), CELL_TITLE); + add_verbose_cell(&ret, _("Net Change"), CELL_TITLE); + add_verbose_cell(&ret, _("Download Size"), CELL_TITLE); + + return ret; } /* returns package info as list of strings */ @@ -798,23 +819,23 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { pm_asprintf(&str, "%s", alpm_pkg_get_name(target->remove)); } - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); /* old and new versions */ pm_asprintf(&str, "%s", target->remove != NULL ? alpm_pkg_get_version(target->remove) : ""); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); pm_asprintf(&str, "%s", target->install != NULL ? alpm_pkg_get_version(target->install) : ""); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_NORMAL); /* and size */ size -= target->remove ? alpm_pkg_get_isize(target->remove) : 0; size += target->install ? alpm_pkg_get_isize(target->install) : 0; human_size = humanize_size(size, 'M', 2, &label); pm_asprintf(&str, "%.2f %s", human_size, label); - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_RIGHT_ALIGN); size = target->install ? alpm_pkg_download_size(target->install) : 0; if(size != 0) { @@ -823,21 +844,11 @@ static alpm_list_t *create_verbose_row(pm_target_t *target) } else { str = NULL; } - ret = alpm_list_add(ret, str); + add_verbose_cell(&ret, str, CELL_RIGHT_ALIGN); return ret; } -static void add_transaction_sizes_row(alpm_list_t **table, const char *label, int size) -{ - struct table_row_t *row = malloc(sizeof(struct table_row_t)); - - row->label = label; - row->size = size; - - *table = alpm_list_add(*table, row); -} - static void display_transaction_sizes(alpm_list_t *table) { alpm_list_t *i; @@ -894,7 +905,10 @@ static void _display_targets(alpm_list_t *targets, int verbose) for(i = targets; i; i = alpm_list_next(i)) { pm_target_t *target = i->data; - rows = alpm_list_add(rows, create_verbose_row(target)); + if(verbose) { + rows = alpm_list_add(rows, create_verbose_row(target)); + } + if(target->install) { pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install), alpm_pkg_get_version(target->install)); @@ -927,8 +941,9 @@ static void _display_targets(alpm_list_t *targets, int verbose) /* rows is a list of lists of strings, free inner lists here */ for(i = rows; i; i = alpm_list_next(i)) { - alpm_list_t *lp = i->data; - FREELIST(lp); + if(i->data) { + alpm_list_free_inner(i->data, free_verbose_cell); + } } alpm_list_free(rows); FREELIST(names); -- 1.8.2.3

3 3