add missing checkSaneLock wrapper for pidlocks

diff --git a/Annex/LockPool/PosixOrPid.hs b/Annex/LockPool/PosixOrPid.hs
index cc14118008c6735b7412a21b871a1e1a332c31fa..58e597f0ec6adf6ef1e65cf8535e2241d641286e 100644 (file)
--- a/Annex/LockPool/PosixOrPid.hs
+++ b/Annex/LockPool/PosixOrPid.hs
@@ -24,9 +24,10 @@ import Common.Annex
 import qualified Annex
 import qualified Utility.LockPool.Posix as Posix
 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.LockPool.STM (LockFile)
-import Utility.LockPool.LockHandle
 import Utility.LockFile.LockStatus
 
 import System.Posix
@@ -51,6 +52,10 @@ getLockStatus :: LockFile -> Annex LockStatus
 getLockStatus f = Posix.getLockStatus f
        `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 = ifM (annexPidLock <$> Annex.getGitConfig)
        ( Just <$> fromRepo gitAnnexPidLockFile

diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs
index 2b0c12c8a168cce1bc117c37c55c059a39742eb3..fe428e21a8523686c863482f714233bef365ffb6 100644 (file)
--- a/Annex/Transfer.hs
+++ b/Annex/Transfer.hs
@@ -96,7 +96,7 @@ runTransfer' ignorelock t file shouldretry transferobserver transferaction = do
                r <- tryLockExclusive (Just mode) lck
                case r of
                        Nothing -> return (Nothing, True)
-                       Just lockhandle -> ifM (liftIO $ checkSaneLock lck lockhandle)
+                       Just lockhandle -> ifM (checkSaneLock lck lockhandle)
                                ( do
                                        void $ liftIO $ tryIO $
                                                writeTransferInfoFile info tfile