From d4513c289098de1044019aa048513df77b4e91e4 Mon Sep 17 00:00:00 2001
From: Yifan Gu <yifan.gu@coreos.com>
Date: Wed, 8 Apr 2015 17:52:31 -0700
Subject: [PATCH] kubelet/DockerManager: Fix returning empty error from
 GetPodStatus().

---
 pkg/kubelet/dockertools/manager.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go
index 7ae3f1f42e4..4e6042690db 100644
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -219,7 +219,7 @@ func (self *DockerManager) GetPodStatus(pod *api.Pod) (*api.PodStatus, error) {
 
 		result := self.inspectContainer(value.ID, dockerContainerName, terminationMessagePath)
 		if result.err != nil {
-			return nil, err
+			return nil, result.err
 		}
 
 		// Add user container information