diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-03-01 12:47:07 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-01 12:51:54 -0400 |
| commit | 77d59dd82957f92b017e1010db109069c6095ada (patch) | |
| tree | 2773827301bc75fdcd325a40f1a89effd5c72e11 /Utility/LockPool | |
| parent | abf80814ab1b722d1c1c0c15d8a79bdd3eb56aec (diff) | |
Fix bug preventing moving files to/from a repository with annex.pidlock set.
Diffstat (limited to 'Utility/LockPool')
| -rw-r--r-- | Utility/LockPool/PidLock.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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. |