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

Fix a build failure on Windows.

Browse source
This commit is contained in:
Joey Hess 2020-10-07 12:04:54 -04:00
parent 8c6f21c348
commit 20f86e43f7
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/PidLock.hs
View file

@ -67,7 +67,7 @@ pidLockChildProcess cmd ps f a = do
let p' = p { env = Just ((v, PidF.pidLockEnvValue) : baseenv) } let p' = p { env = Just ((v, PidF.pidLockEnvValue) : baseenv) }
withCreateProcess p' a withCreateProcess p' a
#else #else
gonopidlock liftIO gonopidlock
#endif #endif
{- Wrap around actions that may run a git-annex child process via a git {- Wrap around actions that may run a git-annex child process via a git

1
CHANGELOG
View file

@ -43,6 +43,7 @@ git-annex (8.20200909) UNRELEASED; urgency=medium
* runshell: Fix a edge case where rm errors were sent to stdout, which * runshell: Fix a edge case where rm errors were sent to stdout, which
could confuse things parsing git-annex output. could confuse things parsing git-annex output.
* runshell: Update files atomically when preparing to run git-annex. * runshell: Update files atomically when preparing to run git-annex.
* Fix a build failure on Windows.
-- Joey Hess <id@joeyh.name> Mon, 14 Sep 2020 18:34:37 -0400 -- Joey Hess <id@joeyh.name> Mon, 14 Sep 2020 18:34:37 -0400

2
doc/bugs/Build_fails_with_type_error_on_Windows.mdwn
View file

@ -40,3 +40,5 @@ This happens when trying to build both the most recent commit (20c7e6c) and the
- stack version: 2.3.3 - stack version: 2.3.3
- Windows version: Windows 7 Enterprise, version 6.1 - Windows version: Windows 7 Enterprise, version 6.1
> [[fixed|done]] --[[Joey]]

12
doc/bugs/Build_fails_with_type_error_on_Windows/comment_1_344be786838e34f65a6a5d1eec866c5f._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2020-10-07T16:03:04Z"
content="""
Thanks for reporting this. I usually only find out when the Windows CI
fails, but it's not been running for a while.
I've fixed this particular problem, but don't have a windows build env
handy to test the rest of the build. Please followup if there's a
subsequent build failure.
"""]]