Merge pull request #14162 from php-coder/oc_cluster_up_err

OpenShift Bot · web-flow · commit 5977d2dc8e9d · 2017-05-13T16:12:02.000-05:00
Merged by openshift-bot
diff --git a/pkg/bootstrap/docker/dockerhelper/helper.go b/pkg/bootstrap/docker/dockerhelper/helper.go
@@ -108,7 +108,7 @@ var (
 func (h *Helper) DockerRoot() (string, error) {
 	info, err := h.dockerInfo()
 	if err != nil {
-		return "", nil
+		return "", err
 	}
 	return info.DockerRootDir, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ var (`
`108`	`108`	`func (h *Helper) DockerRoot() (string, error) {`
`109`	`109`	`info, err := h.dockerInfo()`
`110`	`110`	`if err != nil {`
`111`		`- return "", nil`
	`111`	`+ return "", err`
`112`	`112`	`}`
`113`	`113`	`return info.DockerRootDir, nil`
`114`	`114`	`}`