public_git
/
kaniko
mirror of https://github.com/GoogleContainerTools/kaniko
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove all at path to make way for new reg files and links

This commit is contained in:
peter-evans 2018-10-11 15:33:25 +09:00
parent 796b2515a7
commit 38e8dc2cdd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/util/fs_util.go
View File

@ -193,7 +193,7 @@ func extractFile(dest string, hdr *tar.Header, tr io.Reader) error {
// Check if something already exists at path (symlinks etc.) // Check if something already exists at path (symlinks etc.)
// If so, delete it // If so, delete it
if FilepathExists(path) { if FilepathExists(path) {
if err := os.Remove(path); err != nil { if err := os.RemoveAll(path); err != nil {
return errors.Wrapf(err, "error removing %s to make way for new file.", path) return errors.Wrapf(err, "error removing %s to make way for new file.", path)
} }
} }
@ -242,7 +242,7 @@ func extractFile(dest string, hdr *tar.Header, tr io.Reader) error {
// Check if something already exists at path // Check if something already exists at path
// If so, delete it // If so, delete it
if FilepathExists(path) { if FilepathExists(path) {
if err := os.Remove(path); err != nil { if err := os.RemoveAll(path); err != nil {
return errors.Wrapf(err, "error removing %s to make way for new link", hdr.Name) return errors.Wrapf(err, "error removing %s to make way for new link", hdr.Name)
} }
} }