Browse Source

os: simplify EnsureDir() (#5871)

#5852 fixed an issue with error propagation in `os.EnsureDir()`. However, this function is basically identical to `os.MkdirAll()`, and can be replaced entirely with a call to it. We keep the function for backwards compatibility.
pull/5893/head
Erik Grinaker 4 years ago
committed by Erik Grinaker
parent
commit
5d63765990
1 changed files with 1 additions and 8 deletions
  1. +1
    -8
      libs/os/os.go

+ 1
- 8
libs/os/os.go View File

@ -46,14 +46,7 @@ func Exit(s string) {
// EnsureDir ensures the given directory exists, creating it if necessary.
// Errors if the path already exists as a non-directory.
func EnsureDir(dir string, mode os.FileMode) error {
info, err := os.Stat(dir)
if err != nil && !os.IsNotExist(err) {
return fmt.Errorf("failed to stat %q: %w", dir, err)
}
if info != nil && !info.IsDir() {
return fmt.Errorf("path %q already exists as a non-directory", dir)
}
err = os.MkdirAll(dir, mode)
err := os.MkdirAll(dir, mode)
if err != nil {
return fmt.Errorf("could not create directory %q: %w", dir, err)
}


Loading…
Cancel
Save