summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2012-01-19 11:29:36 +1000
committerDan McGee <dan@archlinux.org>2012-01-18 22:02:38 -0600
commitc77cec2ffc850fa28c5720b8902acc5421069ae4 (patch)
tree9e95646db432b14651ab5cd034656d2733b009bb
parentc231c9af9712e95e58f660d46bd8feaf6fd891e2 (diff)
downloadpacman-c77cec2ffc850fa28c5720b8902acc5421069ae4.tar.xz
Fix missing [removal] output
Currently, a transaction is considered to be purely package removal until the first package install is found. This resulted in the removed packages at the start of a combined upgrade/removal transaction not getting the "[removal]" output. Fixes FS#27981. Signed-off-by: Allan McRae <allan@archlinux.org> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/util.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/pacman/util.c b/src/pacman/util.c
index d72509a5..76054132 100644
--- a/src/pacman/util.c
+++ b/src/pacman/util.c
@@ -835,8 +835,12 @@ static void _display_targets(alpm_list_t *targets, int verbose)
/* add up size of all removed packages */
rsize += alpm_pkg_get_isize(target->remove);
}
+ }
+
+ /* form data for both verbose and non-verbose display */
+ for(i = targets; i; i = alpm_list_next(i)) {
+ pm_target_t *target = i->data;
- /* form data for both verbose and non-verbose display */
rows = alpm_list_add(rows, create_verbose_row(target, show_dl_size));
if(target->install) {
pm_asprintf(&str, "%s-%s", alpm_pkg_get_name(target->install),