more fixes to windows build for content retention files

Will probably build successfully now. Still untested.

diff --git a/Annex/Content.hs b/Annex/Content.hs
index c94aebf0419d550a6c3a930450dd359a3c2b1ec2..0b1454a8615567f462c8ee13af580c12aa486409 100644 (file)
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -164,31 +164,33 @@ lockContentShared key mduration a = do
                , Nothing
                )
 #else
-       lock retention v = 
-               let (locker, postunlock) = winLocker lockShared v
+       lock retention obj lckf = 
+               let (locker, postunlock) = winLocker lockShared' obj lckf
                in 
                        ( locker >>= \case
                                Just lck -> do
                                        writeretention retention
                                        return (Just lck)
                                Nothing -> return Nothing
-                       , \lckfile -> do
-                               maybe noop (\a -> a lckfile) postunlock
-                               lockdropretention v retention
+                       , Just $ \lckfile -> do
+                               maybe noop (\pu -> pu lckfile) postunlock
+                               lockdropretention obj lckf retention
                        )
 
-       lockdropretention _ Nothing = noop
-       lockdropretention v retention@(Just _) = do
+       lockdropretention _ _ Nothing = noop
+       lockdropretention obj lckf retention = do
                -- In order to dropretention, have to
                -- take an exclusive lock.
                let (exlocker, expostunlock) =
-                       winLocker lockExclusive v
+                       winLocker lockExclusive' obj lckf
                exlocker >>= \case
                        Nothing -> noop
                        Just lck -> do
                                dropretention retention
                                liftIO $ dropLock lck
-               fromMaybe noop expostunlock
+                               case (expostunlock, lckf) of
+                                       (Just pu, Just f) -> pu f
+                                       _ -> noop
 #endif
        
        writeretention Nothing = noop
@@ -238,8 +240,10 @@ lockContentForRemoval key fallback a = lockContentUsing lock key fallback $
                        (tryLockExclusive Nothing contentfile)
                in (lck, Nothing)
 #else
-       lock = checkRetentionTimestamp key
-               (winLocker lockExclusive)
+       lock obj lckf = 
+               let (exlocker, expostunlock) =
+                       winLocker lockExclusive' obj lckf
+               in (checkRetentionTimestamp key exlocker, expostunlock)
 #endif
 
 {- Passed the object content file, and maybe a separate lock file to use,
@@ -362,7 +366,7 @@ lockContentUsing contentlocker key fallback a = withContentLockFile key $ \mlock
                case mlockfile of
                        Nothing -> noop -- never reached
                        Just lockfile -> do
-                               maybe noop (\a -> a lockfile) postunlock
+                               maybe noop (\pu -> pu lockfile) postunlock
                                cleanuplockfile lockfile
 #endif