Skip to content

Commit

Permalink
include PR kubernetes#3252
Browse files Browse the repository at this point in the history
  • Loading branch information
cvila84 committed Oct 27, 2018
1 parent a6a9fd4 commit 13e102c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# Bump these on release
VERSION_MAJOR ?= 0
VERSION_MINOR ?= 30
VERSION_BUILD ?= 2
VERSION_BUILD ?= 3
VERSION ?= v$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_BUILD)
DEB_VERSION ?= $(VERSION_MAJOR).$(VERSION_MINOR)-$(VERSION_BUILD)
INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
Expand Down
5 changes: 1 addition & 4 deletions pkg/minikube/machine/cache_images.go
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ func hasWindowsDriveLetter(s string) bool {
}

drive := s[:3]
for _, b := range "CDEFGHIJKLMNOPQRSTUVWXYZAB" {
for _, b := range "CDEFGHIJKLMNOPQRSTUVWXYZABcdefghijklmnopqrstuvwxyzab" {
if d := string(b) + ":"; drive == d+`\` || drive == d+`/` {
return true
}
Expand All @@ -160,9 +160,6 @@ func replaceWinDriveLetterToVolumeName(s string) (string, error) {
return "", err
}
path := vname + s[3:]
if _, err := os.Stat(filepath.Dir(path)); err != nil {
return "", err
}

return path, nil
}
Expand Down

0 comments on commit 13e102c

Please sign in to comment.