summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-10-12 15:48:59 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-10-12 15:48:59 -0400
commit7a530c4a6a64943e10456ea4669c54524890f4cf (patch)
treee507f2907ef6b8c0fe490db39ac037477358c17c /Annex/Content.hs
parentdd76f02cfb94e6025cae53d1b6a15ba17a96839b (diff)
fix windows build
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 0b15ce53b..9648083cb 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -256,8 +256,9 @@ lockContentUsing locker key a = do
maybe noop cleanuplockfile mlockfile
liftIO $ dropLock lck
#else
- unlock mlockfile mlockhandle = do
- liftIO $ maybe noop dropLock mlockhandle
+ unlock mlockfile lck = do
+ -- Can't delete a locked file on Windows
+ liftIO $ dropLock lck
maybe noop cleanuplockfile mlockfile
#endif