Skip to content

Commit 414a286

Browse files
authored
Merge pull request kubernetes#3996 from tstromberg/cache-err-compare
Fix reversed err comparison and improve logging
2 parents a30092a + 04c6f70 commit 414a286

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/minikube/machine/cache_images.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ func LoadImages(cmd bootstrapper.CommandRunner, images []string, cacheDir string
9898
src := filepath.Join(cacheDir, image)
9999
src = sanitizeCacheDir(src)
100100
if err := loadImageFromCache(cmd, cc.KubernetesConfig, src); err != nil {
101+
glog.Warningf("Failed to load %s: %v", src, err)
101102
return errors.Wrapf(err, "loading image %s", src)
102103
}
103104
return nil
@@ -200,9 +201,9 @@ func getWindowsVolumeNameCmd(d string) (string, error) {
200201

201202
// loadImageFromCache loads a single image from the cache
202203
func loadImageFromCache(cr bootstrapper.CommandRunner, k8s config.KubernetesConfig, src string) error {
203-
glog.Infoln("Loading image from cache at ", src)
204+
glog.Infof("Loading image from cache: %s", src)
204205
filename := filepath.Base(src)
205-
if _, err := os.Stat(src); err == nil {
206+
if _, err := os.Stat(src); err != nil {
206207
return err
207208
}
208209
dst := path.Join(tempLoadDir, filename)

0 commit comments

Comments
 (0)