From 9a5f9fddc68475218ddb76027e00497f9a612984 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 18 Dec 2013 15:05:29 -0400 Subject: assistant: Fix OSX-specific bug that caused the startup scan to try to follow symlinks to other directories, and add their contents to the annex. --- Utility/DirWatcher/FSEvents.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Utility/DirWatcher/FSEvents.hs') diff --git a/Utility/DirWatcher/FSEvents.hs b/Utility/DirWatcher/FSEvents.hs index 18c73ec57..db6ac0434 100644 --- a/Utility/DirWatcher/FSEvents.hs +++ b/Utility/DirWatcher/FSEvents.hs @@ -67,7 +67,9 @@ watchDir dir ignored hooks = do | otherwise = noop scan d = unless (ignoredPath ignored d) $ - mapM_ go =<< dirContentsRecursive d + -- Do not follow symlinks when scanning. + -- This mirrors the inotify startup scan behavior. + mapM_ go =<< dirContentsRecursiveSkipping (const False) False d where go f | ignoredPath ignored f = noop -- cgit v1.2.3