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

avoid needing --force on windows despite no lsof

Browse source 
Note that I still need to think this through and make sure handling of open
files is safe. This is just for testing purposes.
This commit is contained in:
Joey Hess 2013-12-09 16:56:15 -04:00
parent 51b43f2b68
commit 2066e90421
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/Watcher.hs
View file

@ -50,9 +50,13 @@ import Data.Time.Clock
checkCanWatch :: Annex () checkCanWatch :: Annex ()
checkCanWatch checkCanWatch
| canWatch = do | canWatch = do
#ifndef mingw32_HOST_OS
liftIO Lsof.setup liftIO Lsof.setup
unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force) unlessM (liftIO (inPath "lsof") <||> Annex.getState Annex.force)
needLsof needLsof
#else
noop
#endif
| otherwise = error "watch mode is not available on this system" | otherwise = error "watch mode is not available on this system"
needLsof :: Annex () needLsof :: Annex ()