mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

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.

Browse source
This commit is contained in:
Joey Hess 2013-12-18 15:05:29 -04:00
parent fcf6384389
commit c99d6a8151
7 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/DirWatcher/FSEvents.hs
View file

@ -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

2
Utility/DirWatcher/Win32Notify.hs
View file

@ -42,7 +42,7 @@ watchDir dir ignored hooks = do
runhook h s = maybe noop (\a -> a (filePath evt) s) (h hooks)
scan d = unless (ignoredPath ignored d) $
mapM_ go =<< dirContentsRecursive d
mapM_ go =<< dirContentsRecursiveSkipping (const False) False d
where
go f
| ignoredPath ignored f = noop