diff options
| -rw-r--r-- | Utility/Gpg.hs | 5 | ||||
| -rw-r--r-- | debian/changelog | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index f3a1ac0bb..b50e775d0 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -28,8 +28,9 @@ stdParams params = do let batch = if isNothing e then [] else ["--batch"] return $ batch ++ defaults ++ toCommand params where - -- be quiet, even about checking the trustdb - defaults = ["--quiet", "--trust-model", "always"] + -- be quiet, even about checking the trustdb, + -- and avoid using a tty + defaults = ["--quiet", "--trust-model", "always", "--no-tty"] {- Runs gpg with some params and returns its stdout, strictly. -} readStrict :: [CommandParam] -> IO String diff --git a/debian/changelog b/debian/changelog index d6dc7d2b5..18e241e8d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -git-annex (3.20111232) UNRELEASED; urgency=low +git-annex (3.20120105) UNRELEASED; urgency=low * Added annex-web-options configuration settings, which can be used to provide parameters to whichever of wget or curl git-annex uses @@ -11,6 +11,7 @@ git-annex (3.20111232) UNRELEASED; urgency=low * Added quickcheck to build dependencies, and fail if test suite cannot be built. * fsck: Do backend-specific check before checking numcopies is satisfied. + * Run gpg with --no-tty. Closes: #654721 -- Joey Hess <joeyh@debian.org> Mon, 02 Jan 2012 14:19:19 -0400 |