diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-05-21T11·29+0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21T11·29+0200 |
| commit | 4d829916e7c81529257e25dd4fca1cc27096ba8d (patch) | |
| tree | e788377d1cede6f60cb1cb893c13c883ded20e61 | |
| parent | cdcdf3e798373b06c8c3e2b53c5722b91ea5f42e (diff) | |
| parent | 6ade7ec022c836b7d1f9bd06be45e2c07835ec8c (diff) | |
Merge pull request #2800 from flokli/progress-bar-hide-unknown-expected
progress-bar: hide expected if expected is 0 (unknown)
| -rw-r--r-- | src/nix/progress-bar.cc | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/nix/progress-bar.cc b/src/nix/progress-bar.cc index 304f918cc5..e710454081 100644 --- a/src/nix/progress-bar.cc +++ b/src/nix/progress-bar.cc @@ -352,11 +352,18 @@ public: if (running || done || expected || failed) { if (running) - s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt, - running / unit, done / unit, expected / unit); + if (expected != 0) + s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt, + running / unit, done / unit, expected / unit); + else + s = fmt(ANSI_BLUE + numberFmt + ANSI_NORMAL "/" ANSI_GREEN + numberFmt + ANSI_NORMAL, + running / unit, done / unit); else if (expected != done) - s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt, - done / unit, expected / unit); + if (expected != 0) + s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL "/" + numberFmt, + done / unit, expected / unit); + else + s = fmt(ANSI_GREEN + numberFmt + ANSI_NORMAL, done / unit); else s = fmt(done ? ANSI_GREEN + numberFmt + ANSI_NORMAL : numberFmt, done / unit); s = fmt(itemFmt, s); |