From 8ce435fb4fcdf055db0b81007579ea76c003cdd6 Mon Sep 17 00:00:00 2001
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 20 Mar 2012 15:24:26 -0400
Subject: add --batch to gpg invocations, since gpg2 requires it to use
 --passphrase-* arguments

---
 src/share/m/gen_subkey | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/share/m/gen_subkey')

diff --git a/src/share/m/gen_subkey b/src/share/m/gen_subkey
index cf1ed0c..f181804 100644
--- a/src/share/m/gen_subkey
+++ b/src/share/m/gen_subkey
@@ -80,7 +80,7 @@ save"
 
     # FIXME: are we adequately cleaning up any trailing gpg process here?
     trap "rm -rf $fifoDir; kill %% || true" EXIT
-    echo "$editCommands" | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
+    echo "$editCommands" | gpg_user --batch --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --edit-key "$keyID" &
 
     log debug "Prompting for passphrase"
     # FIXME: this needs to fail more gracefully if the passphrase is incorrect
-- 
cgit v1.2.3