GitList

Browse code

Fix io.Reader ambiguity on EOF in progressreader

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

Tibor Vass authored on 2014/07/26 07:31:06
Showing 1 changed files

utils/progressreader.go index a43ee55..87eae8b 100644

@@ -32,7 +32,7 @@ func (r *progressReader) Read(p []byte) (n int, err error) {
 		r.lastUpdate = r.progress.Current
 	}
 	// Send newline when complete
-	if r.newLine && err != nil {
+	if r.newLine && err != nil && read == 0 {
 		r.output.Write(r.sf.FormatStatus("", ""))
 	}
 	return read, err

...	...	@@ -32,7 +32,7 @@ func (r *progressReader) Read(p []byte) (n int, err error) {
32	32	r.lastUpdate = r.progress.Current
33	33	}
34	34	// Send newline when complete
35		- if r.newLine && err != nil {
	35	+ if r.newLine && err != nil && read == 0 {
36	36	r.output.Write(r.sf.FormatStatus("", ""))
37	37	}
38	38	return read, err