summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-28 04:46:22 -0500
committerDan McGee <dan@archlinux.org>2011-09-28 10:18:42 -0500
commit6f3a657f66b9c766b5fa6c51c26283d3547f5169 (patch)
treeb515eb5d3efd9231bc1c25091fd9beadca7a5c27
parentbcc6a5d72df3cb3ee9f3d2347526c3dc03d5f55a (diff)
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 <dan@archlinux.org>
-rw-r--r--src/pacman/sync.c2
-rw-r--r--src/pacman/util.c4
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);