kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #7942 from estesp/7747-stderr-stdout-bug 

Fix gh#7747: filter bare newline output and log client pull to stdout
This commit is contained in:
Victor Vieux 2014-09-22 10:53:34 -07:00
parent ac75835931 b5184d3c24
commit 28e308c25e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/client/commands.go
View File

@ -1967,7 +1967,7 @@ func (cli *DockerCli) pullImage(image string) error {
registryAuthHeader := []string{
base64.URLEncoding.EncodeToString(buf),
}
if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.err, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil {
if err = cli.stream("POST", "/images/create?"+v.Encode(), nil, cli.out, map[string][]string{"X-Registry-Auth": registryAuthHeader}); err != nil {
return err
}
return nil

4
utils/jsonmessage.go
View File

@ -144,7 +144,9 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
if !ok {
line = len(ids)
ids[jm.ID] = line
fmt.Fprintf(out, "\n")
if isTerminal {
fmt.Fprintf(out, "\n")
}
diff = 0
} else {
diff = len(ids) - line