Merge pull request moby#485 from tonistiigi/progressui-fix

tonistiigi · web-flow · commit 9acf51e49185 · 2018-07-03T14:58:01.000-07:00
progressui: fix log line separation bug
diff --git 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{}{}

Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,9 @@ func (t trace) update(s client.SolveStatus) {`
`212`	`212`	`if !ok {`
`213`	`213`	`continue // shouldn't happen`
`214`	`214`	`}`
	`215`	`+ i := 0`
`215`	`216`	`complete := split(l.Data, byte('\n'), func(dt []byte) {`
`216`		`- if v.logsPartial && len(v.logs) != 0 {`
	`217`	`+ if v.logsPartial && len(v.logs) != 0 && i == 0 {`
`217`	`218`	`v.logs[len(v.logs)-1] = append(v.logs[len(v.logs)-1], dt...)`
`218`	`219`	`} else {`
`219`	`220`	`ts := time.Duration(0)`
`@@ -222,6 +223,7 @@ func (t trace) update(s client.SolveStatus) {`
`222`	`223`	`}`
`223`	`224`	`v.logs = append(v.logs, []byte(fmt.Sprintf("#%d %s %s", v.index, fmt.Sprintf("%#.4g", ts.Seconds())[:5], dt)))`
`224`	`225`	`}`
	`226`	`+ i++`
`225`	`227`	`})`
`226`	`228`	`v.logsPartial = !complete`
`227`	`229`	`t.updates[v.Digest] = struct{}{}`