perso/syncthing-arm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lib/scanner: Fix previous commit: don't stop scan completely

Browse Source
This commit is contained in:
Jakob Borg 2017-01-05 15:05:49 +01:00
parent 926c88cfc4
commit 7a16dbd31d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/scanner/walk.go
View File

@ -281,8 +281,11 @@ func (w *walker) walkAndHashFiles(fchan, dchan chan protocol.FileInfo) filepath.
if err := w.walkSymlink(absPath, relPath, dchan); err != nil { if err := w.walkSymlink(absPath, relPath, dchan); err != nil {
return err return err
} }
// under no circumstances shall we descend into a symlink if info.IsDir() {
return filepath.SkipDir // under no circumstances shall we descend into a symlink
return filepath.SkipDir
}
return nil
case info.Mode().IsDir(): case info.Mode().IsDir():
err = w.walkDir(relPath, info, dchan) err = w.walkDir(relPath, info, dchan)