diff options
| -rw-r--r-- | Utility/Gpg.hs | 8 | ||||
| -rw-r--r-- | test.hs | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index 8f7e27870..4c798f273 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -23,9 +23,13 @@ newtype KeyIds = KeyIds [String] stdParams :: [CommandParam] -> IO [String] stdParams params = do -- Enable batch mode if GPG_AGENT_INFO is set, to avoid extraneous - -- gpg output about password prompts. + -- gpg output about password prompts. GPG_BATCH is set by the test + -- suite for a similar reason. e <- getEnv "GPG_AGENT_INFO" - let batch = if isNothing e then [] else ["--batch", "--no-tty"] + b <- getEnv "GPG_BATCH" + let batch = if isNothing e && isNothing b + then [] + else ["--batch", "--no-tty"] return $ batch ++ defaults ++ toCommand params where -- be quiet, even about checking the trustdb @@ -664,7 +664,7 @@ test_bup_remote = "git-annex bup remote" ~: intmpclonerepo $ when Build.SysConfi test_crypto :: Test test_crypto = "git-annex crypto" ~: intmpclonerepo $ when Build.SysConfig.gpg $ do -- force gpg into batch mode for the tests - setEnv "GPG_AGENT_INFO" "/dev/null" True + setEnv "GPG_BATCH" "1" True Utility.Gpg.testTestHarness @? "test harness self-test failed" Utility.Gpg.testHarness $ do createDirectory "dir" |