From b7009a4b3ad7e495be61a61e9aacc5e263073670 Mon Sep 17 00:00:00 2001 From: John Howard Date: Tue, 6 Oct 2015 11:38:23 -0700 Subject: [PATCH] No error shadow pullImageIfNotExist Signed-off-by: John Howard --- integration-cli/docker_utils.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-cli/docker_utils.go b/integration-cli/docker_utils.go index f0e8b6bc32..6092f31b67 100644 --- a/integration-cli/docker_utils.go +++ b/integration-cli/docker_utils.go @@ -609,16 +609,16 @@ func imageExists(image string) error { return err } -func pullImageIfNotExist(image string) (err error) { +func pullImageIfNotExist(image string) error { if err := imageExists(image); err != nil { pullCmd := exec.Command(dockerBinary, "pull", image) _, exitCode, err := runCommandWithOutput(pullCmd) if err != nil || exitCode != 0 { - err = fmt.Errorf("image %q wasn't found locally and it couldn't be pulled: %s", image, err) + return fmt.Errorf("image %q wasn't found locally and it couldn't be pulled: %s", image, err) } } - return + return nil } func dockerCmdWithError(args ...string) (string, int, error) {