diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2020-11-11 01:13:13 +0100 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2020-11-11 01:13:13 +0100 |
| commit | dd2703096f3ee7f4b6b96e2b649daf85aa8d6030 (patch) | |
| tree | 15cdb2e9a50a77ba8cb15537e19fe6eb6b1f83e3 /g10/delkey.c | |
| parent | gpg: In batch mode, delete-secret-key is not okay without --yes. (diff) | |
| download | gnupg2-dd2703096f3ee7f4b6b96e2b649daf85aa8d6030.tar.xz gnupg2-dd2703096f3ee7f4b6b96e2b649daf85aa8d6030.zip | |
gpg: Fix the previous commit.
* g10/delkey.c (do_delete_key): Fix the condition for the error.
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to '')
| -rw-r--r-- | g10/delkey.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/delkey.c b/g10/delkey.c index 05b9301ee..458c451e0 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -38,6 +38,7 @@ #include "filter.h" #include "../common/ttyio.h" #include "../common/i18n.h" +#include "../common/shareddefs.h" #include "call-agent.h" @@ -152,7 +153,8 @@ do_delete_key (ctrl_t ctrl, const char *username, int secret, int force, if (opt.batch && exactmatch) { - if (!opt.answer_yes && secret) + if (secret && opt.pinentry_mode == PINENTRY_MODE_LOOPBACK + && !opt.answer_yes) log_error(_("can't do this in batch mode without \"--yes\"\n")); else okay++; |