From bab88f3596c570346a3d069af9e3c8ed92e473c9 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 8 Oct 2015 14:27:37 -0400 Subject: 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. --- Command/Move.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Command/Move.hs') 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 -- cgit v1.2.3