progressui: fix index printing on partial rows

tonistiigi · tonistiigi · commit aae870584e3d · 2023-06-08T18:25:48.000-07:00
Signed-off-by: Tonis Tiigi &lt;tonistiigi@gmail.com&gt;
diff --git a/util/progress/progressui/printer.go b/util/progress/progressui/printer.go
@@ -143,10 +143,13 @@ func (p *textMux) printVtx(t *trace, dgst digest.Digest) {
 	}
 
 	for i, l := range v.logs {
-		if i == 0 {
+		if i == 0 && v.logsOffset != 0 { // index has already been printed
 			l = l[v.logsOffset:]
+			fmt.Fprintf(p.w, "%s", l)
+		} else {
+			fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))
 		}
-		fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))
+
 		if i != len(v.logs)-1 || !v.logsPartial {
 			fmt.Fprintln(p.w, "")
 		}

Original file line number	Diff line number	Diff line change
`@@ -143,10 +143,13 @@ func (p textMux) printVtx(t trace, dgst digest.Digest) {`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`for i, l := range v.logs {`
`146`		`- if i == 0 {`
	`146`	`+ if i == 0 && v.logsOffset != 0 { // index has already been printed`
`147`	`147`	`l = l[v.logsOffset:]`
	`148`	`+ fmt.Fprintf(p.w, "%s", l)`
	`149`	`+ } else {`
	`150`	`+ fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))`
`148`	`151`	`}`
`149`		`- fmt.Fprintf(p.w, "#%d %s", v.index, []byte(l))`
	`152`	`+`
`150`	`153`	`if i != len(v.logs)-1 \|\| !v.logsPartial {`
`151`	`154`	`fmt.Fprintln(p.w, "")`
`152`	`155`	`}`