From 7a16dbd31d8fec23625b78cb5455f976c4518dfc Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Thu, 5 Jan 2017 15:05:49 +0100 Subject: [PATCH] lib/scanner: Fix previous commit: don't stop scan completely --- lib/scanner/walk.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/scanner/walk.go b/lib/scanner/walk.go index e2505046..1ddd7810 100644 --- a/lib/scanner/walk.go +++ b/lib/scanner/walk.go @@ -281,8 +281,11 @@ func (w *walker) walkAndHashFiles(fchan, dchan chan protocol.FileInfo) filepath. if err := w.walkSymlink(absPath, relPath, dchan); err != nil { return err } - // under no circumstances shall we descend into a symlink - return filepath.SkipDir + if info.IsDir() { + // under no circumstances shall we descend into a symlink + return filepath.SkipDir + } + return nil case info.Mode().IsDir(): err = w.walkDir(relPath, info, dchan)