diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-08-17 08:22:43 -0700 |
| commit | dcd208513d24c609719065c51eb176f6b0df3024 (patch) | |
| tree | 035865be9e0812fb5e01d8abadb5159d924966e5 /Utility/Gpg.hs | |
| parent | 95bfbcd3e3952dc1e22fbc313394c54c3ababad4 (diff) | |
| parent | fe8fee235b11e58cfda7e8a09e120b0daabe3f43 (diff) | |
Merge branch 'master' into assistant
Conflicts:
debian/changelog
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 eed77805c..923f6d5be 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -28,7 +28,7 @@ stdParams params = do b <- getEnv "GPG_BATCH" let batch = if isNothing e && isNothing b then [] - else ["--batch", "--no-tty"] + else ["--batch", "--no-tty", "--use-agent"] return $ batch ++ defaults ++ toCommand params where -- be quiet, even about checking the trustdb |