From 917c5fb8ec48e22459d77e3849e6d388f93d3260 Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Thu, 14 Jun 2012 13:23:46 +0200 Subject: Imported Upstream version 1.0.2 --- src/pkg/path/filepath/path.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/pkg/path/filepath/path.go') diff --git a/src/pkg/path/filepath/path.go b/src/pkg/path/filepath/path.go index a4e429bae..815021bd0 100644 --- a/src/pkg/path/filepath/path.go +++ b/src/pkg/path/filepath/path.go @@ -320,8 +320,11 @@ func walk(path string, info os.FileInfo, walkFn WalkFunc) error { } for _, fileInfo := range list { - if err = walk(Join(path, fileInfo.Name()), fileInfo, walkFn); err != nil { - return err + err = walk(Join(path, fileInfo.Name()), fileInfo, walkFn) + if err != nil { + if !fileInfo.IsDir() || err != SkipDir { + return err + } } } return nil -- cgit v1.2.3