Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #1469 : Remove file that matches with the directory path #1478

Merged
merged 8 commits into from
Nov 5, 2020
Merged

Fixes #1469 : Remove file that matches with the directory path #1478

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f447977
Fixes #1469 : Remove file that matches with the directory path
anugu-chegg Nov 3, 2020
499a1d8
Fixes #1469 : Remove file that matches with the directory path
Anugushashank Nov 3, 2020
cb91b57
Merge branch 'fix_error_not_a_directory' of github.com:Anugushashank/…
Anugushashank Nov 4, 2020
dab6cf6
Fixes #1469 : Fix lint errors
Anugushashank Nov 4, 2020
b336cbe
Fixes #1469 : Fix lint errors
Anugushashank Nov 4, 2020
c8e38fb
Fixes #1469 : Fix lint errors
Anugushashank Nov 5, 2020
9b83c87
Fixes #1469 : Reduce conditional depth
anugu-chegg Nov 5, 2020
a0f30cb
Fixes #1469 : Remove an additional line
anugu-chegg Nov 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions pkg/util/fs_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,6 +749,15 @@ func Volumes() []string {
}

func mkdirAllWithPermissions(path string, mode os.FileMode, uid, gid int64) error {
// Check if a file already exists on the path, if yes then delete it
info, err := os.Stat(path)
if !os.IsNotExist(err) && !info.IsDir() {
logrus.Tracef("removing file because it needs to be a directory %s", path)
if err := os.Remove(path); err != nil {
return errors.Wrapf(err, "error removing %s to make way for new directory.", path)
}
}

if err := os.MkdirAll(path, mode); err != nil {
return err
}
Expand Down