diff options
author | Joey Hess <joeyh@joeyh.name> | 2015-11-16 15:35:41 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2015-11-16 15:35:41 -0400 |
commit | 7d5a6b9fea20a0aec0e716ea855b46e460b3da7d (patch) | |
tree | 65ee23d9672a6b8d4d3dc1de01a882095bc3ee1b /Annex/LockPool | |
parent | 24cdd3abc3170f25913e49e8fb6ccf7b0d23a770 (diff) |
add missing checkSaneLock wrapper for pidlocks
Diffstat (limited to 'Annex/LockPool')
-rw-r--r-- | Annex/LockPool/PosixOrPid.hs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Annex/LockPool/PosixOrPid.hs b/Annex/LockPool/PosixOrPid.hs index cc1411800..58e597f0e 100644 --- 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 |