summaryrefslogtreecommitdiff
path: root/src/share/m/gen_subkey
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2012-03-20 15:24:26 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2012-03-20 15:24:26 -0400
commit8ce435fb4fcdf055db0b81007579ea76c003cdd6 (patch)
tree5876130ab7ebf3fed839a1fdd700ec1ae7e0ca5d /src/share/m/gen_subkey
parentdf0fa237a75d9651a441c347ec9feaf453b30ad6 (diff)
add --batch to gpg invocations, since gpg2 requires it to use --passphrase-* arguments
Diffstat (limited to 'src/share/m/gen_subkey')
-rw-r--r--src/share/m/gen_subkey2
1 files changed, 1 insertions, 1 deletions
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