diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-01-07 12:38:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-01-07 12:38:08 -0400 |
| commit | 60c1aeeb6fa106756c00e7bb18bbf311bd553fe1 (patch) | |
| tree | d46eb17e9f156439396828370187da6ff4002161 /Utility | |
| parent | bdc49ddbdb32146356fe2040d08071d7ce963466 (diff) | |
Fix overbroad gpg --no-tty fix from last release.
Only set --no-tty when GPG_AGENT_INFO is set and batch mode is used.
In the test suite, set GPG_AGENT_INFO to /dev/null to avoid the test suite
relying on /dev/tty.
Diffstat (limited to 'Utility')
| -rw-r--r-- | Utility/Gpg.hs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index b50e775d0..8f7e27870 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -25,12 +25,11 @@ stdParams params = do -- Enable batch mode if GPG_AGENT_INFO is set, to avoid extraneous -- gpg output about password prompts. e <- getEnv "GPG_AGENT_INFO" - let batch = if isNothing e then [] else ["--batch"] + let batch = if isNothing e then [] else ["--batch", "--no-tty"] return $ batch ++ defaults ++ toCommand params where - -- be quiet, even about checking the trustdb, - -- and avoid using a tty - defaults = ["--quiet", "--trust-model", "always", "--no-tty"] + -- be quiet, even about checking the trustdb + defaults = ["--quiet", "--trust-model", "always"] {- Runs gpg with some params and returns its stdout, strictly. -} readStrict :: [CommandParam] -> IO String |