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

fix build on windows

Browse source 
Annex.GitOverlay was using a module that needs posix to build.
This commit is contained in:
Joey Hess 2020-07-01 11:21:10 -04:00
parent 98a8a6da81
commit d3d187c869
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/LockPool/PosixOrPid.hs
View file

@ -18,12 +18,10 @@ module Annex.LockPool.PosixOrPid (
LockStatus(..),
getLockStatus,
checkSaneLock,
pidLockFile,
) where
import Common
import Types
import Annex.Locations
import qualified Annex
import qualified Utility.LockPool.Posix as Posix
import qualified Utility.LockPool.PidLock as Pid
@ -32,6 +30,7 @@ import Utility.LockPool.LockHandle (LockHandle, dropLock)
import Utility.LockFile.Posix (openLockFile)
import Utility.LockPool.STM (LockFile)
import Utility.LockFile.LockStatus
import Config (pidLockFile)
import System.Posix
@ -63,12 +62,6 @@ checkSaneLock :: LockFile -> LockHandle -> Annex Bool
checkSaneLock f h = H.checkSaneLock f h
`pidLockCheck` flip Pid.checkSaneLock h
pidLockFile :: Annex (Maybe FilePath)
pidLockFile = ifM (annexPidLock <$> Annex.getGitConfig)
( Just <$> Annex.fromRepo gitAnnexPidLockFile
, pure Nothing
)
pidLockCheck :: IO a -> (LockFile -> IO a) -> Annex a
pidLockCheck posixcheck pidcheck = debugLocks $
liftIO . maybe posixcheck pidcheck =<< pidLockFile