mirror of https://github.com/helm/helm.git
Merge pull request #31227 from evankanderson/windows-filepath
Use filepath.Path when handling directory names
This commit is contained in:
commit
0adfe83ff8
|
@ -26,7 +26,6 @@ import (
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/url"
|
"net/url"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
|
@ -697,7 +696,7 @@ func createOrOpenFile(filename string, appendData bool) (*os.File, error) {
|
||||||
|
|
||||||
// check if the directory exists to create file. creates if doesn't exist
|
// check if the directory exists to create file. creates if doesn't exist
|
||||||
func ensureDirectoryForFile(file string) error {
|
func ensureDirectoryForFile(file string) error {
|
||||||
baseDir := path.Dir(file)
|
baseDir := filepath.Dir(file)
|
||||||
_, err := os.Stat(baseDir)
|
_, err := os.Stat(baseDir)
|
||||||
if err != nil && !errors.Is(err, fs.ErrNotExist) {
|
if err != nil && !errors.Is(err, fs.ErrNotExist) {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -23,7 +23,6 @@ import (
|
||||||
"io"
|
"io"
|
||||||
"io/fs"
|
"io/fs"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"regexp"
|
"regexp"
|
||||||
"slices"
|
"slices"
|
||||||
|
@ -250,7 +249,7 @@ func createOrOpenFile(filename string, appendData bool) (*os.File, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func ensureDirectoryForFile(file string) error {
|
func ensureDirectoryForFile(file string) error {
|
||||||
baseDir := path.Dir(file)
|
baseDir := filepath.Dir(file)
|
||||||
_, err := os.Stat(baseDir)
|
_, err := os.Stat(baseDir)
|
||||||
if err != nil && !errors.Is(err, fs.ErrNotExist) {
|
if err != nil && !errors.Is(err, fs.ErrNotExist) {
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue