summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Chantry <shiningxc@gmail.com>2008-08-11 23:32:36 +0200
committerDan McGee <dan@archlinux.org>2008-08-14 04:13:10 +0200
commit89c2c51964d5e4f297e767befb56a65c18dc3d6f (patch)
treead8e6a82939910cb3e8d734f45f0edc360c83728
parenta23fc08758cbbc7aa861eee2f537d4e1048bb039 (diff)
downloadpacman-89c2c51964d5e4f297e767befb56a65c18dc3d6f.tar.gz
pacman-89c2c51964d5e4f297e767befb56a65c18dc3d6f.tar.xz
pacman/callback.c : fix detection of totaldownload
This fixes FS#11180. The usage of the total percent was detected like this : /* use disp_percent if it is not 0, else show bar_percent */ However, it is very possible that the total percent is 0 at the beginning, if the first packages downloaded are very small compared to the total download. Signed-off-by: Xavier Chantry <shiningxc@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/callback.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index f968873f..b8e2d77e 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -139,8 +139,8 @@ static void fill_progress(const int bar_percent, const int disp_percent,
}
/* print percent after progress bar */
if(proglen > 5) {
- /* use disp_percent if it is not 0, else show bar_percent */
- int p = disp_percent ? disp_percent : bar_percent;
+ /* show total download percent if option is enabled */
+ int p = config->totaldownload ? disp_percent : bar_percent;
printf(" %3d%%", p);
}