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

add missing checkSaneLock wrapper for pidlocks

Browse source
This commit is contained in:
Joey Hess 2015-11-16 15:35:41 -04:00
parent e2b4861bff
commit 262c37c16e
Failed to extract signature
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/LockPool/PosixOrPid.hs
View file

@ -24,9 +24,10 @@ import Common.Annex
import qualified Annex import qualified Annex
import qualified Utility.LockPool.Posix as Posix import qualified Utility.LockPool.Posix as Posix
import qualified Utility.LockPool.PidLock as Pid import qualified Utility.LockPool.PidLock as Pid
import qualified Utility.LockPool.LockHandle as H
import Utility.LockPool.LockHandle (LockHandle, dropLock)
import Utility.LockFile.Posix (openLockFile) import Utility.LockFile.Posix (openLockFile)
import Utility.LockPool.STM (LockFile) import Utility.LockPool.STM (LockFile)
import Utility.LockPool.LockHandle
import Utility.LockFile.LockStatus import Utility.LockFile.LockStatus
import System.Posix import System.Posix
@ -51,6 +52,10 @@ getLockStatus :: LockFile -> Annex LockStatus
getLockStatus f = Posix.getLockStatus f getLockStatus f = Posix.getLockStatus f
`pidLockCheck` Pid.getLockStatus `pidLockCheck` Pid.getLockStatus
checkSaneLock :: LockFile -> LockHandle -> Annex Bool
checkSaneLock f h = H.checkSaneLock f h
`pidLockCheck` flip Pid.checkSaneLock h
pidLockFile :: Annex (Maybe FilePath) pidLockFile :: Annex (Maybe FilePath)
pidLockFile = ifM (annexPidLock <$> Annex.getGitConfig) pidLockFile = ifM (annexPidLock <$> Annex.getGitConfig)
( Just <$> fromRepo gitAnnexPidLockFile ( Just <$> fromRepo gitAnnexPidLockFile

2
Annex/Transfer.hs
View file

@ -96,7 +96,7 @@ runTransfer' ignorelock t file shouldretry transferobserver transferaction = do
r <- tryLockExclusive (Just mode) lck r <- tryLockExclusive (Just mode) lck
case r of case r of
Nothing -> return (Nothing, True) Nothing -> return (Nothing, True)
Just lockhandle -> ifM (liftIO $ checkSaneLock lck lockhandle) Just lockhandle -> ifM (checkSaneLock lck lockhandle)
( do ( do
void $ liftIO $ tryIO $ void $ liftIO $ tryIO $
writeTransferInfoFile info tfile writeTransferInfoFile info tfile