From 07d81896031b7bd0dfd77de8eba8fc7eacf0a703 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Tue, 3 Jul 2018 14:42:13 -0700 Subject: [PATCH] progressui: fix log line separation bug Signed-off-by: Tonis Tiigi --- util/progress/progressui/display.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/progress/progressui/display.go b/util/progress/progressui/display.go index fd7a8c23c..0be544d42 100644 --- a/util/progress/progressui/display.go +++ b/util/progress/progressui/display.go @@ -212,8 +212,9 @@ func (t *trace) update(s *client.SolveStatus) { if !ok { continue // shouldn't happen } + i := 0 complete := split(l.Data, byte('\n'), func(dt []byte) { - if v.logsPartial && len(v.logs) != 0 { + if v.logsPartial && len(v.logs) != 0 && i == 0 { v.logs[len(v.logs)-1] = append(v.logs[len(v.logs)-1], dt...) } else { ts := time.Duration(0) @@ -222,6 +223,7 @@ func (t *trace) update(s *client.SolveStatus) { } v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%#.4g", ts.Seconds())[:5], dt))) } + i++ }) v.logsPartial = !complete t.updates[v.Digest] = struct{}{}