Skip to content

K
k3s
Commit cf7671d2 authored by Michail Kargakis's avatar Michail Kargakis
Browse files
Options

kubectl: use platform-agnostic helper in edit

https://github.com/kubernetes/kubernetes/issues/22371 still stands for Windows clients since path.Base is not platform-agnostic[1]. Use filepath.Base instead[2]. [1] https://golang.org/src/path/path.go?s=4482:4511#L166 [2] https://golang.org/src/path/filepath/path.go?s=12257:12286#L409
parent 26c99fee
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/kubectl/cmd/edit.go
View file @ cf7671d2
...@@ -22,7 +22,7 @@ import ( ...@@ -22,7 +22,7 @@ import (
"fmt" "fmt"
"io" "io"
"os" "os"
"path" "path/filepath"
gruntime "runtime" gruntime "runtime"
"strings" "strings"
...@@ -227,7 +227,7 @@ outter: ...@@ -227,7 +227,7 @@ outter:
// launch the editor // launch the editor
editedDiff := edited editedDiff := edited
edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", path.Base(os.Args[0])), ext, buf) edited, file, err = edit.LaunchTempFile(fmt.Sprintf("%s-edit-", filepath.Base(os.Args[0])), ext, buf)
if err != nil { if err != nil {
return preservedFile(err, results.file, errOut) return preservedFile(err, results.file, errOut)
} }
...@@ -350,7 +350,7 @@ outter: ...@@ -350,7 +350,7 @@ outter:
// 3. invalid: retry those on the spot by looping ie. reloading the editor // 3. invalid: retry those on the spot by looping ie. reloading the editor
if results.retryable > 0 { if results.retryable > 0 {
fmt.Fprintln(errOut, errorMsg) fmt.Fprintln(errOut, errorMsg)
fmt.Fprintf(errOut, "You can run `%s replace -f %s` to try this update again.\n", path.Base(os.Args[0]), file) fmt.Fprintf(errOut, "You can run `%s replace -f %s` to try this update again.\n", filepath.Base(os.Args[0]), file)
continue outter continue outter
} }
if results.notfound > 0 { if results.notfound > 0 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment