diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-08 14:27:37 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-08 14:29:35 -0400 |
| commit | bab88f3596c570346a3d069af9e3c8ed92e473c9 (patch) | |
| tree | 32384db58de249ef11c524446d1e0bf757c5fa10 /Command/Move.hs | |
| parent | 5434414bff35367aa62a4aaab0c4731a38dbe76e (diff) | |
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.
Diffstat (limited to 'Command/Move.hs')
| -rw-r--r-- | Command/Move.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index a83ea04dd..072c00663 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -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 |