From 6f3a657f66b9c766b5fa6c51c26283d3547f5169 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Wed, 28 Sep 2011 04:46:22 -0500 Subject: Always show download size if -w/--downloadonly was provided The prompt can be rather confusing otherwise when all files have already been downloaded, but there is not a single total size listed. Signed-off-by: Dan McGee --- src/pacman/sync.c | 2 +- src/pacman/util.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pacman/sync.c b/src/pacman/sync.c index 48ae30cf..5d6dcb99 100644 --- a/src/pacman/sync.c +++ b/src/pacman/sync.c @@ -960,7 +960,7 @@ int pacman_sync(alpm_list_t *targets) } alpm_list_t *targs = alpm_list_strdup(targets); - if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY) && !config->print) { + if(!config->op_s_downloadonly && !config->print) { /* check for newer versions of packages to be upgraded first */ alpm_list_t *packages = syncfirst(); if(packages) { diff --git a/src/pacman/util.c b/src/pacman/util.c index 3dedf9f0..fc4194a1 100644 --- a/src/pacman/util.c +++ b/src/pacman/util.c @@ -875,11 +875,11 @@ static void _display_targets(alpm_list_t *targets) } printf("\n"); - if(dlsize > 0) { + if(dlsize > 0 || config->op_s_downloadonly) { size = humanize_size(dlsize, 'M', &label); printf(_("Total Download Size: %.2f %s\n"), size, label); } - if(!(config->flags & ALPM_TRANS_FLAG_DOWNLOADONLY)) { + if(!config->op_s_downloadonly) { if(isize > 0) { size = humanize_size(isize, 'M', &label); printf(_("Total Installed Size: %.2f %s\n"), size, label); -- cgit v1.2.3-24-g4f1b