From 8ce435fb4fcdf055db0b81007579ea76c003cdd6 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor 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/import_subkey | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/share/m/import_subkey') diff --git a/src/share/m/import_subkey b/src/share/m/import_subkey index 8d60f26..3571c7b 100644 --- a/src/share/m/import_subkey +++ b/src/share/m/import_subkey @@ -51,11 +51,11 @@ import_subkey() { if [ "$sshKeyFile" = '-' ] ; then log verbose "importing ssh key from stdin..." PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" \ - | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & + | gpg_user --batch --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & else log verbose "importing ssh key from file '$sshKeyFile'..." PEM2OPENPGP_USAGE_FLAGS=authenticate pem2openpgp "$userID" <"$sshKeyFile" \ - | gpg_user --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & + | gpg_user --batch --passphrase-fd 3 3< "$fifoDir/pass" --expert --command-fd 0 --import & fi # get the password if needed -- cgit v1.2.3