From: Bjørn Erik Pedersen Date: Fri, 25 Mar 2016 17:18:39 +0000 (+0100) Subject: Fix error handling in SymbolicWalk X-Git-Tag: v0.16~152 X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dbfc7ea0249ff8447ae5ccdd100596317c897659;p=brevno-suite%2Fhugo Fix error handling in SymbolicWalk --- diff --git a/helpers/path.go b/helpers/path.go index 5f1e8339..a5b17656 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 }