From 1ff7610118cbbbfe697205295864b5205904ad3d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 12 Oct 2015 15:48:59 -0400 Subject: [PATCH] fix windows build --- Annex/Content.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Annex/Content.hs b/Annex/Content.hs index 0b15ce53b1..9648083cb2 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