From 421dee55d08727a0d62c0e8ee1d1274b161870da Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Fri, 1 Jul 2016 15:14:12 +0100
Subject: [PATCH] diagnostics: Correct error formatting

They should be formatted as %s not %#v (which prints all sorts of opaque
pointers).

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 alpine/packages/diagnostics/main.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/alpine/packages/diagnostics/main.go b/alpine/packages/diagnostics/main.go
index e36d19e08..39291ab7d 100644
--- a/alpine/packages/diagnostics/main.go
+++ b/alpine/packages/diagnostics/main.go
@@ -22,11 +22,11 @@ func run(timeout time.Duration, w *tar.Writer, command string, args ...string) {
 	c := exec.Command(command, args...)
 	stdoutPipe, err := c.StdoutPipe()
 	if err != nil {
-		log.Fatalf("Failed to create stdout pipe: %#v", err)
+		log.Fatalf("Failed to create stdout pipe: %s", err)
 	}
 	stderrPipe, err := c.StderrPipe()
 	if err != nil {
-		log.Fatalf("Failed to create stderr pipe: %#v", err)
+		log.Fatalf("Failed to create stderr pipe: %s", err)
 	}
 	var stdoutBuffer bytes.Buffer
 	var stderrBuffer bytes.Buffer
@@ -129,20 +129,20 @@ func main() {
 
 	ip, err := net.Listen("tcp", ":62374")
 	if err != nil {
-		log.Printf("Failed to bind to TCP port 62374: %#v", err)
+		log.Printf("Failed to bind to TCP port 62374: %s", err)
 	} else {
 		listeners = append(listeners, ip)
 	}
 	vsock, err := vsock.Listen(uint(62374))
 	if err != nil {
-		log.Printf("Failed to bind to vsock port 62374: %#v", err)
+		log.Printf("Failed to bind to vsock port 62374: %s", err)
 	} else {
 		listeners = append(listeners, vsock)
 	}
 	svcid, _ := hvsock.GuidFromString("445BA2CB-E69B-4912-8B42-D7F494D007EA")
 	hvsock, err := hvsock.Listen(hvsock.HypervAddr{VmId: hvsock.GUID_WILDCARD, ServiceId: svcid})
 	if err != nil {
-		log.Printf("Failed to bind to hvsock port: %#v", err)
+		log.Printf("Failed to bind to hvsock port: %s", err)
 	} else {
 		listeners = append(listeners, hvsock)
 	}
@@ -152,7 +152,7 @@ func main() {
 			for {
 				conn, err := l.Accept()
 				if err != nil {
-					log.Printf("Error accepting connection: %#v", err)
+					log.Printf("Error accepting connection: %s", err)
 					return // no more listening
 				}
 				go func(conn net.Conn) {