From d55776e85a04a52bc1ac22e46af22828a48e51dc Mon Sep 17 00:00:00 2001
From: Euan Kemp <euan.kemp@coreos.com>
Date: Thu, 19 Jan 2017 09:28:16 -0800
Subject: [PATCH] dockertools/nsenterexec: fix err shadow

The shadow of err meant the combination of `exec-handler=nsenter` +
`tty` + a non-zero exit code meant that the exit code would be LOST
FOREVER :ghost:

This isn't all that important since no one really used the nsenter exec
handler as I understand it
---
 pkg/kubelet/dockertools/exec.go | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkg/kubelet/dockertools/exec.go b/pkg/kubelet/dockertools/exec.go
index f234698c76f..83fad9c6e99 100644
--- a/pkg/kubelet/dockertools/exec.go
+++ b/pkg/kubelet/dockertools/exec.go
@@ -53,6 +53,7 @@ func (*NsenterExecHandler) ExecInContainer(client DockerInterface, container *do
 	args = append(args, container.Config.Env...)
 	args = append(args, cmd...)
 	command := exec.Command(nsenter, args...)
+	var cmdErr error
 	if tty {
 		p, err := kubecontainer.StartPty(command)
 		if err != nil {
@@ -75,7 +76,7 @@ func (*NsenterExecHandler) ExecInContainer(client DockerInterface, container *do
 			go io.Copy(stdout, p)
 		}
 
-		err = command.Wait()
+		cmdErr = command.Wait()
 	} else {
 		if stdin != nil {
 			// Use an os.Pipe here as it returns true *os.File objects.
@@ -97,13 +98,13 @@ func (*NsenterExecHandler) ExecInContainer(client DockerInterface, container *do
 			command.Stderr = stderr
 		}
 
-		err = command.Run()
+		cmdErr = command.Run()
 	}
 
-	if exitErr, ok := err.(*exec.ExitError); ok {
+	if exitErr, ok := cmdErr.(*exec.ExitError); ok {
 		return &utilexec.ExitErrorWrapper{ExitError: exitErr}
 	}
-	return err
+	return cmdErr
 }
 
 // NativeExecHandler executes commands in Docker containers using Docker's exec API.