opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 18:08:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20240 from n1hility/fix-wsl-version-detection

Browse Source 
Fix locale issues with WSL version detection
This commit is contained in:
openshift-ci[bot]
2023-10-03 13:45:07 +00:00
committed by GitHub
parent fdf3e4b23d cbca395291
commit 2457c259b3
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/machine/wsl/wutil/wutil.go
View File

@ -50,20 +50,13 @@ func IsWSLInstalled() bool {
func IsWSLStoreVersionInstalled() bool { func IsWSLStoreVersionInstalled() bool {
cmd := SilentExecCmd("wsl", "--version") cmd := SilentExecCmd("wsl", "--version")
out, err := cmd.StdoutPipe() cmd.Stdout = nil
cmd.Stderr = nil cmd.Stderr = nil
if err != nil { if err := cmd.Run(); err != nil {
return false
}
if err = cmd.Start(); err != nil {
return false
}
hasVersion := matchOutputLine(out, "WSL version:")
if err := cmd.Wait(); err != nil {
return false return false
} }
return hasVersion return true
} }
func matchOutputLine(output io.ReadCloser, match string) bool { func matchOutputLine(output io.ReadCloser, match string) bool {