clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-27 03:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16804 from Microsoft/jjh/fixpullimageifnotexist

Browse Source 
No err shadowing on pullImageIfNotExist
This commit is contained in:
Vincent Demeester
2015-10-06 22:02:45 +02:00
parent 931e6129d0 b7009a4b3a
commit aee0fcf413
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration-cli/docker_utils.go
+3 -3
View File
@@ -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) {