From 20f86e43f7bb896b1e9fe18815395384b8d6fa4f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 7 Oct 2020 12:04:54 -0400 Subject: [PATCH] Fix a build failure on Windows. --- Annex/PidLock.hs | 2 +- CHANGELOG | 1 + doc/bugs/Build_fails_with_type_error_on_Windows.mdwn | 2 ++ ...mment_1_344be786838e34f65a6a5d1eec866c5f._comment | 12 ++++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 doc/bugs/Build_fails_with_type_error_on_Windows/comment_1_344be786838e34f65a6a5d1eec866c5f._comment diff --git a/Annex/PidLock.hs b/Annex/PidLock.hs index 7b17d4096f..6d3f0a7925 100644 --- a/Annex/PidLock.hs +++ b/Annex/PidLock.hs @@ -67,7 +67,7 @@ pidLockChildProcess cmd ps f a = do let p' = p { env = Just ((v, PidF.pidLockEnvValue) : baseenv) } withCreateProcess p' a #else - gonopidlock + liftIO gonopidlock #endif {- Wrap around actions that may run a git-annex child process via a git diff --git a/CHANGELOG b/CHANGELOG index 4801d7f0a9..b7e02c0b5c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -43,6 +43,7 @@ git-annex (8.20200909) UNRELEASED; urgency=medium * runshell: Fix a edge case where rm errors were sent to stdout, which could confuse things parsing git-annex output. * runshell: Update files atomically when preparing to run git-annex. + * Fix a build failure on Windows. -- Joey Hess Mon, 14 Sep 2020 18:34:37 -0400 diff --git a/doc/bugs/Build_fails_with_type_error_on_Windows.mdwn b/doc/bugs/Build_fails_with_type_error_on_Windows.mdwn index 6397e2c993..c7e1e8d652 100644 --- a/doc/bugs/Build_fails_with_type_error_on_Windows.mdwn +++ b/doc/bugs/Build_fails_with_type_error_on_Windows.mdwn @@ -40,3 +40,5 @@ This happens when trying to build both the most recent commit (20c7e6c) and the - stack version: 2.3.3 - Windows version: Windows 7 Enterprise, version 6.1 + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/Build_fails_with_type_error_on_Windows/comment_1_344be786838e34f65a6a5d1eec866c5f._comment b/doc/bugs/Build_fails_with_type_error_on_Windows/comment_1_344be786838e34f65a6a5d1eec866c5f._comment new file mode 100644 index 0000000000..a33122f8a4 --- /dev/null +++ b/doc/bugs/Build_fails_with_type_error_on_Windows/comment_1_344be786838e34f65a6a5d1eec866c5f._comment @@ -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. +"""]]