diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-15 20:33:52 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-15 20:33:52 -0400 |
| commit | a87f9b63077c8b93f4b2284d494c0081bd938f8d (patch) | |
| tree | d56e424b73aecfca32f24b637fcc0dcc2050adce /Utility/Gpg.hs | |
| parent | 10ff3282ee60cc41ad9d9ac71a99eea7053cebaa (diff) | |
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.
Diffstat (limited to 'Utility/Gpg.hs')
| -rw-r--r-- | Utility/Gpg.hs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |