toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix jsonmessage

Browse Source 
Upstream-commit: 4bc100b494022901d4d7f51cba303ae3562b1303
Component: engine
This commit is contained in:
Victor Vieux
2013-12-04 11:57:18 -08:00
parent 0624a140ec
commit dbb1b9b6d5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/utils/jsonmessage.go
+3 -3
View File
@@ -38,11 +38,11 @@ func (p *JSONProgress) String() string {
width = int(ws.Width)
}
if p.Current == 0 && p.Total == 0 {
if p.Current <= 0 && p.Total <= 0 {
return ""
}
current := HumanSize(int64(p.Current))
if p.Total == 0 {
if p.Total <= 0 {
return fmt.Sprintf("%8v", current)
}
total := HumanSize(int64(p.Total))
@@ -126,7 +126,7 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
if jm.Progress != nil {
jm.Progress.terminalFd = terminalFd
}
if (jm.Progress != nil || jm.ProgressMessage != "") && jm.ID != "" {
if jm.Progress != nil || jm.ProgressMessage != "" {
line, ok := ids[jm.ID]
if !ok {
line = len(ids)