send errors from fs.Walk() to debug log

clarify non-err returns from Walk where err is already proved to be nil
This commit is contained in:
George Armhold 2017-10-27 08:41:17 -04:00
parent e44ac55f63
commit 8a37c07295

View file

@ -252,23 +252,27 @@ func (b *Local) List(ctx context.Context, t restic.FileType) <-chan string {
go func() { go func() {
defer close(ch) defer close(ch)
fs.Walk(b.Basedir(t), func(path string, fi os.FileInfo, err error) error { err := fs.Walk(b.Basedir(t), func(path string, fi os.FileInfo, err error) error {
if err != nil { if err != nil {
return err return err
} }
if !isFile(fi) { if !isFile(fi) {
return err return nil
} }
select { select {
case ch <- filepath.Base(path): case ch <- filepath.Base(path):
case <-ctx.Done(): case <-ctx.Done():
return err return nil
} }
return err return nil
}) })
if err != nil {
debug.Log("Walk %v", err)
}
}() }()
return ch return ch