vendor: update fsutil to 0b8b62dee

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
docker-18.09
Tonis Tiigi 2018-01-11 17:59:31 -08:00
parent 99b32f1878
commit 7f0ad90c84
2 changed files with 7 additions and 2 deletions

View File

@ -36,7 +36,7 @@ github.com/BurntSushi/locker a6e239ea1c69bff1cfdb20c4b73dadf52f784b6a
github.com/docker/docker 6f723db8c6f0c7f0b252674a9673a25b5978db04 https://github.com/tonistiigi/docker.git github.com/docker/docker 6f723db8c6f0c7f0b252674a9673a25b5978db04 https://github.com/tonistiigi/docker.git
github.com/pkg/profile 5b67d428864e92711fcbd2f8629456121a56d91f github.com/pkg/profile 5b67d428864e92711fcbd2f8629456121a56d91f
github.com/tonistiigi/fsutil 2a21b014ddf5de0ceb4649fd458e5f5b79220d59 github.com/tonistiigi/fsutil 0b8b62deeb18fecebc272676425c1416d1e86fec
github.com/dmcgowan/go-tar go1.10 github.com/dmcgowan/go-tar go1.10
github.com/hashicorp/go-immutable-radix 826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git github.com/hashicorp/go-immutable-radix 826af9ccf0feeee615d546d69b11f8e98da8c8f1 git://github.com/tonistiigi/go-immutable-radix.git
github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4

View File

@ -40,13 +40,18 @@ func Walk(ctx context.Context, p string, opt *WalkOpt, fn filepath.WalkFunc) err
} }
seenFiles := make(map[uint64]string) seenFiles := make(map[uint64]string)
return filepath.Walk(root, func(path string, fi os.FileInfo, err error) error { return filepath.Walk(root, func(path string, fi os.FileInfo, err error) (retErr error) {
if err != nil { if err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
return filepath.SkipDir return filepath.SkipDir
} }
return err return err
} }
defer func() {
if retErr != nil && os.IsNotExist(errors.Cause(retErr)) {
retErr = filepath.SkipDir
}
}()
origpath := path origpath := path
path, err = filepath.Rel(root, path) path, err = filepath.Rel(root, path)
if err != nil { if err != nil {