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

fix windows build

Browse source
This commit is contained in:
Joey Hess 2021-06-22 09:46:06 -04:00
parent 4b93e933db
commit 0fe550af75
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Annex/Init.hs
View file

@ -51,8 +51,8 @@ import Annex.Tmp
import Utility.UserInfo import Utility.UserInfo
import qualified Utility.RawFilePath as R import qualified Utility.RawFilePath as R
import Utility.ThreadScheduler import Utility.ThreadScheduler
#ifndef mingw32_HOST_OS
import Annex.Perms import Annex.Perms
#ifndef mingw32_HOST_OS
import Utility.FileMode import Utility.FileMode
import System.Posix.User import System.Posix.User
import qualified Utility.LockFile.Posix as Posix import qualified Utility.LockFile.Posix as Posix
@ -255,7 +255,7 @@ probeCrippledFileSystem'
-> Maybe (RawFilePath -> m ()) -> Maybe (RawFilePath -> m ())
-> m (Bool, [String]) -> m (Bool, [String])
#ifdef mingw32_HOST_OS #ifdef mingw32_HOST_OS
probeCrippledFileSystem' _ _ = return (True, []) probeCrippledFileSystem' _ _ _ = return (True, [])
#else #else
probeCrippledFileSystem' tmp freezecontent thawcontent = do probeCrippledFileSystem' tmp freezecontent thawcontent = do
let f = tmp P.</> "gaprobe" let f = tmp P.</> "gaprobe"

2
doc/bugs/Build_fails_on_Windows_as_of_commit_4b1b9d7a8.mdwn
View file

@ -2,3 +2,5 @@ As of commit 4b1b9d7a8, trying to build git-annex on Windows fails because of a
[[!meta author=jwodder]] [[!meta author=jwodder]]
[[!tag projects/datalad]] [[!tag projects/datalad]]
> [[done]], thank you jwodder! --[[Joey]]