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

Merge pull request #1086 from tejal29/705 

check for filepath.Walk error everywhere
This commit is contained in:
Tejal Desai 2020-03-04 09:31:10 -08:00 committed by GitHub
parent 17ceb312c6 dd5d2e6661
commit 9ceab7ff04
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/commands/copy_test.go
View File

@ -62,6 +62,9 @@ func setupTestTemp() string {
}
cperr := filepath.Walk(srcPath,
func(path string, info os.FileInfo, err error) error {
if err != nil {
return err
}
if path != srcPath {
if err != nil {
return err

7
pkg/util/fs_util.go
View File

@ -188,7 +188,12 @@ func GetFSFromLayers(root string, layers []v1.Layer, opts ...FSOpt) ([]string, e
// DeleteFilesystem deletes the extracted image file system
func DeleteFilesystem() error {
logrus.Info("Deleting filesystem...")
return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, _ error) error {
return filepath.Walk(constants.RootDir, func(path string, info os.FileInfo, err error) error {
if err != nil {
// ignore errors when deleting.
return nil
}
if CheckWhitelist(path) {
if !isExist(path) {
logrus.Debugf("Path %s whitelisted, but not exists", path)