From a87f9b63077c8b93f4b2284d494c0081bd938f8d Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Oct 2014 20:33:52 -0400 Subject: Use haskell setenv library to clean up several ugly workarounds for inability to manipulate the environment on windows. Didn't know that this library existed! This includes making git-annex not re-exec itself on start on windows, and making the test suite on Windows run tests without forking. --- Utility/Gpg.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Utility/Gpg.hs') diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index f880e55fa..50f78a1de 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -334,7 +334,7 @@ testHarness a = do setup = do base <- getTemporaryDirectory dir <- mktmpdir $ base "gpgtmpXXXXXX" - void $ setEnv var dir True + setEnv var dir True -- For some reason, recent gpg needs a trustdb to be set up. _ <- pipeStrict [Params "--trust-model auto --update-trustdb"] [] _ <- pipeStrict [Params "--import -q"] $ unlines -- cgit v1.2.3