Merge pull request #4930 from vieux/fix_regression_import

Fix regression import

integration-cli/docker_cli_import_test.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+	"testing"
+)
+
+func TestImportDisplay(t *testing.T) {
+	importCmd := exec.Command(dockerBinary, "import", "https://github.com/ewindisch/docker-cirros/raw/master/cirros-0.3.0-x86_64-lxc.tar.gz")
+	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)
+	}
+
+	logDone("import - cirros was imported and display is fine")
+}

utils/jsonmessage.go

@@ -131,7 +131,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 != "" {
+		if jm.ID != "" && (jm.Progress != nil || jm.ProgressMessage != "") {
 			line, ok := ids[jm.ID]
 			if !ok {
 				line = len(ids)
@@ -141,18 +141,16 @@ func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr,
 			} else {
 				diff = len(ids) - line
 			}
-			if isTerminal {
+			if jm.ID != "" && isTerminal {
 				// <ESC>[{diff}A = move cursor up diff rows
 				fmt.Fprintf(out, "%c[%dA", 27, diff)
 			}
 		}
 		err := jm.Display(out, isTerminal)
-		if jm.ID != "" {
-			if isTerminal {
+		if jm.ID != "" && isTerminal {
 			// <ESC>[{diff}B = move cursor down diff rows
 			fmt.Fprintf(out, "%c[%dB", 27, diff)
 		}
-		}
 		if err != nil {
 			return err
 		}