Don't run gpg in batch mode, so it can prompt for passphrase when there is no agent.

2 files changed, 8 insertions, 1 deletions

diff --git a/Crypto.hs b/Crypto.hs
index bbe8a6f4c..6b5d1218a 100644
--- a/Crypto.hs
+++ b/Crypto.hs
@@ -167,7 +167,7 @@ pass to c i a = to c i $ \h -> a =<< L.hGetContents h
 gpgParams :: [CommandParam] -> [String]
 gpgParams params =
 	-- avoid prompting, and be quiet, even about checking the trustdb
-	["--batch", "--quiet", "--trust-model", "always"] ++
+	["--quiet", "--trust-model", "always"] ++
 	toCommand params
 
 gpgRead :: [CommandParam] -> IO String
diff --git a/debian/changelog b/debian/changelog
index 750f467d5..c837da876 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-annex (0.20110418) UNRELEASED; urgency=low
+
+  * Don't run gpg in batch mode, so it can prompt for passphrase when
+    there is no agent.
+
+ -- Joey Hess <joeyh@debian.org>  Sun, 17 Apr 2011 14:29:49 -0400
+
 git-annex (0.20110417) unstable; urgency=low
 
   * bup is now supported as a special type of remote.