mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix build on windows

Browse source 
broken by ed0afbc36b

Sponsored-by: Dartmouth College's Datalad project
This commit is contained in:
Joey Hess 2021-12-03 14:07:11 -04:00
parent 5d9cc3e5af
commit 6988c2e740
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utility/LockPool/Windows.hs
View file

@ -24,7 +24,7 @@ import Utility.LockPool.STM (LockFile, LockMode(..))
lockShared :: LockFile -> IO (Maybe LockHandle) lockShared :: LockFile -> IO (Maybe LockHandle)
lockShared file = tryMakeLockHandle P.lockPool file lockShared file = tryMakeLockHandle P.lockPool file
(\p f -> P.tryTakeLock p f LockShared) (\p f -> P.tryTakeLock p f LockShared)
(\f -> fmap mk <$> F.lockShared f) (\f _ -> fmap mk <$> F.lockShared f)
{- Tries to take an exclusive lock on a file. Fails if another process has {- Tries to take an exclusive lock on a file. Fails if another process has
- a shared or exclusive lock. - a shared or exclusive lock.
@ -35,7 +35,7 @@ lockShared file = tryMakeLockHandle P.lockPool file
lockExclusive :: LockFile -> IO (Maybe LockHandle) lockExclusive :: LockFile -> IO (Maybe LockHandle)
lockExclusive file = tryMakeLockHandle P.lockPool file lockExclusive file = tryMakeLockHandle P.lockPool file
(\p f -> P.tryTakeLock p f LockExclusive) (\p f -> P.tryTakeLock p f LockExclusive)
(\f -> fmap mk <$> F.lockExclusive f) (\f _ -> fmap mk <$> F.lockExclusive f)
{- If the initial lock fails, this is a BUSY wait, and does not {- If the initial lock fails, this is a BUSY wait, and does not
- guarentee FIFO order of waiters. In other news, Windows is a POS. -} - guarentee FIFO order of waiters. In other news, Windows is a POS. -}

7
doc/bugs/annex_get_should_retry_failed_downloads_from_S3/comment_5_3b840d50a1ecc9cb6e161e3c039fe332._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="joey"
subject="""comment 5"""
date="2021-12-03T18:07:56Z"
content="""
Indeed, fixed that.
"""]]