From 77d59dd82957f92b017e1010db109069c6095ada Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 1 Mar 2016 12:47:07 -0400 Subject: Fix bug preventing moving files to/from a repository with annex.pidlock set. --- Utility/LockPool/PidLock.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Utility') diff --git a/Utility/LockPool/PidLock.hs b/Utility/LockPool/PidLock.hs index dca353fdf..8cacd4bf6 100644 --- a/Utility/LockPool/PidLock.hs +++ b/Utility/LockPool/PidLock.hs @@ -33,7 +33,7 @@ import Prelude -- Takes a pid lock, blocking until the lock is available or the timeout. waitLock :: Seconds -> LockFile -> IO LockHandle waitLock timeout file = makeLockHandle - (P.waitTakeLock P.lockPool file LockExclusive) + (P.waitTakeLock P.lockPool file LockShared) (mk <$> F.waitLock timeout file) -- Tries to take a pid lock, but does not block. -- cgit v1.2.3