Flush stdout on import to avoid deadklock when waiting for stdin (import -). Fixed #365

Upstream-commit: 1eaaa6b744b8017e7d31bdf9dc7095663b4c930c Component: engine
2013-04-09 10:02:57 -07:00
parent 00965e0e9e
commit 34cecb4070
1 changed files with 2 additions and 1 deletions
@@ -419,7 +419,8 @@ func (srv *Server) CmdKill(stdin io.ReadCloser, stdout io.Writer, args ...string
 	return nil
 }

-func (srv *Server) CmdImport(stdin io.ReadCloser, stdout io.Writer, args ...string) error {
+func (srv *Server) CmdImport(stdin io.ReadCloser, stdout rcli.DockerConn, args ...string) error {
+	stdout.Flush()
 	cmd := rcli.Subcmd(stdout, "import", "[OPTIONS] URL|- [REPOSITORY [TAG]]", "Create a new filesystem image from the contents of a tarball")
 	var archive io.Reader
 	var resp *http.Response