From dbfc7ea0249ff8447ae5ccdd100596317c897659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 25 Mar 2016 18:18:39 +0100 Subject: [PATCH] Fix error handling in SymbolicWalk --- helpers/path.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers/path.go b/helpers/path.go index 5f1e83398..a5b176568 100644 --- a/helpers/path.go +++ b/helpers/path.go @@ -453,14 +453,14 @@ func SymbolicWalk(fs afero.Fs, root string, walker filepath.WalkFunc) error { // Handle the root first fileInfo, err := lstatIfOs(fs, root) - if err != nil || !fileInfo.IsDir() { - return nil - } - if err != nil { return walker(root, nil, err) } + if !fileInfo.IsDir() { + return nil + } + if err := walker(root, fileInfo, err); err != nil && err != filepath.SkipDir { return err }