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

windows build fix from jwodder

Browse source
This commit is contained in:
Joey Hess 2021-02-15 13:35:01 -04:00
parent 0cb2b1b126
commit 48310f2d55
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Remote/Git.hs
View file

@ -46,6 +46,7 @@ import Logs.Location
import Utility.Metered import Utility.Metered
import Utility.CopyFile import Utility.CopyFile
import Utility.Env import Utility.Env
import Utility.FileMode
import Utility.Batch import Utility.Batch
import Utility.SimpleProtocol import Utility.SimpleProtocol
import Utility.Touch import Utility.Touch
@ -70,7 +71,6 @@ import Messages.Progress
#ifndef mingw32_HOST_OS #ifndef mingw32_HOST_OS
import qualified Utility.RawFilePath as R import qualified Utility.RawFilePath as R
import Utility.FileMode
#endif #endif
import Control.Concurrent import Control.Concurrent
@ -654,7 +654,7 @@ copyFromRemoteCheap st repo
) )
| otherwise = Nothing | otherwise = Nothing
#else #else
copyFromRemoteCheap _ _ _ = Nothing copyFromRemoteCheap _ _ = Nothing
#endif #endif
{- Tries to copy a key's content to a remote's annex. -} {- Tries to copy a key's content to a remote's annex. -}
@ -927,6 +927,7 @@ newCopyCoWTried = CopyCoWTried <$> newEmptyMVar
fileCopier :: State -> Copier fileCopier :: State -> Copier
#ifdef mingw32_HOST_OS #ifdef mingw32_HOST_OS
fileCopier _st src dest k meterupdate check verifyconfig = docopy fileCopier _st src dest k meterupdate check verifyconfig = docopy
where
#else #else
fileCopier st src dest k meterupdate check verifyconfig = fileCopier st src dest k meterupdate check verifyconfig =
-- If multiple threads reach this at the same time, they -- If multiple threads reach this at the same time, they

2
doc/bugs/Windows_build_failing_as_of_commit_cb7bb3e.mdwn
View file

@ -2,3 +2,5 @@ As of commit cb7bb3e, trying to build git-annex on Windows fails with a syntax e
[[!meta author=jwodder]] [[!meta author=jwodder]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> applied, thanks [[done]] --[[Joey]]