From d75a79eacc3b0dad00b45f8f4666f58bf65c13cd Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 28 Feb 2022 23:40:45 -0800 Subject: [PATCH] progressui: handle case where active statuses appear completed vertex Signed-off-by: Tonis Tiigi --- util/progress/progressui/printer.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util/progress/progressui/printer.go b/util/progress/progressui/printer.go index a453e9dc9..61ccaa0d6 100644 --- a/util/progress/progressui/printer.go +++ b/util/progress/progressui/printer.go @@ -75,6 +75,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) { } v.events = v.events[:0] + isOpenStatus := false // remote cache loading can currently produce status updates without active vertex for _, s := range v.statuses { if _, ok := v.statusUpdates[s.ID]; ok { doPrint := true @@ -118,6 +119,8 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) { } if s.Completed != nil { tm += " done" + } else { + isOpenStatus = true } fmt.Fprintf(p.w, "#%d %s%s%s\n", v.index, s.ID, bytes, tm) } @@ -157,7 +160,7 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) { } p.current = dgst - if v.Completed != nil { + if v.Completed != nil && !isOpenStatus { p.current = "" v.count = 0