add lockContentShared

Also, rename lockContent to lockContentExclusive

inAnnexSafe should perhaps be eliminated, and instead use
`lockContentShared inAnnex`. However, I'm waiting on that, as there are
only 2 call sites for inAnnexSafe and it's fiddly.
This commit is contained in:
Joey Hess 2015-10-08 14:27:37 -04:00
parent f52d4b684d
commit 4d50958ed7
Failed to extract signature
11 changed files with 100 additions and 50 deletions

View file

@ -123,7 +123,7 @@ toPerform dest move key afile fastcheck isthere =
finish
where
finish
| move = lockContent key $ \contentlock -> do
| move = lockContentExclusive key $ \contentlock -> do
removeAnnex contentlock
next $ Command.Drop.cleanupLocal key
| otherwise = next $ return True