erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-10-21 21:37:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #20243 from openshift-cherrypick-robot/cherry-pick-20240-to-v4.7

Browse source 
[v4.7] Fix locale issues with WSL version detection
This commit is contained in:
openshift-ci[bot] 2023-10-03 15:48:57 +00:00 • committed by GitHub
commit e82b43475f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 10 deletions
Show stats 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 {
cmd := SilentExecCmd("wsl", "--version")
out, err := cmd.StdoutPipe()
cmd.Stdout = nil
cmd.Stderr = nil
if err != nil {
return false
}
if err = cmd.Start(); err != nil {
return false
}
hasVersion := matchOutputLine(out, "WSL version:")
if err := cmd.Wait(); err != nil {
if err := cmd.Run(); err != nil {
return false
}
return hasVersion
return true
}
func matchOutputLine(output io.ReadCloser, match string) bool {