From f70f5a32c78dc696ec1c3668fd972438df2e66b1 Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 25 Jul 2014 18:29:47 -0400 Subject: [PATCH 1/2] address a few nits Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) Upstream-commit: d082381a93810e6c386382f24da93518880e9250 Component: engine --- components/engine/integration-cli/docker_cli_import_test.go | 4 ++-- components/engine/server/server.go | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/engine/integration-cli/docker_cli_import_test.go b/components/engine/integration-cli/docker_cli_import_test.go index 9b36aa9ce1..f9e86f01bd 100644 --- a/components/engine/integration-cli/docker_cli_import_test.go +++ b/components/engine/integration-cli/docker_cli_import_test.go @@ -12,8 +12,8 @@ func TestImportDisplay(t *testing.T) { out, _, err := runCommandWithOutput(importCmd) errorOut(err, t, fmt.Sprintf("import failed with errors: %v", err)) - if n := len(strings.Split(out, "\n")); n != 3 { - t.Fatalf("display is messed up: %d '\\n' instead of 3", n) + if n := strings.Count(out, "\n"); n != 2 { + t.Fatalf("display is messed up: %d '\\n' instead of 2", n) } logDone("import - cirros was imported and display is fine") diff --git a/components/engine/server/server.go b/components/engine/server/server.go index 41a4af32bc..87c910b580 100644 --- a/components/engine/server/server.go +++ b/components/engine/server/server.go @@ -1701,8 +1701,6 @@ func (srv *Server) ImageImport(job *engine.Job) engine.Status { u.Path = "" } job.Stdout.Write(sf.FormatStatus("", "Downloading from %s", u)) - // Download with curl (pretty progress bar) - // If curl is not available, fallback to http.Get() resp, err = utils.Download(u.String()) if err != nil { return job.Error(err) From 1da81ba36335afb1ab2e557d2c06263b283d92fd Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Fri, 25 Jul 2014 18:31:06 -0400 Subject: [PATCH 2/2] Fix io.Reader ambiguity on EOF in progressreader Docker-DCO-1.1-Signed-off-by: Tibor Vass (github: tiborvass) Upstream-commit: caa57699283fd0fa47cac59c80adcacaa5c9950e Component: engine --- components/engine/utils/progressreader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/utils/progressreader.go b/components/engine/utils/progressreader.go index a43ee55b0f..87eae8ba73 100644 --- a/components/engine/utils/progressreader.go +++ b/components/engine/utils/progressreader.go @@ -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