From f9bbc751633f38f58fecb71c33aae735e9b30241 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 10 Nov 2020 14:08:24 +0900 Subject: [PATCH] gpg: In batch mode, delete-secret-key is not okay without --yes. * g10/delkey.c (do_delete_key): Emit an error when not --yes. -- GnuPG-bug-id: 4667 Signed-off-by: NIIBE Yutaka --- g10/delkey.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/g10/delkey.c b/g10/delkey.c index b89451089..05b9301ee 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -151,7 +151,12 @@ do_delete_key (ctrl_t ctrl, const char *username, int secret, int force, if (opt.batch && exactmatch) - okay++; + { + if (!opt.answer_yes && secret) + log_error(_("can't do this in batch mode without \"--yes\"\n")); + else + okay++; + } else if (opt.batch && secret) { log_error(_("can't do this in batch mode\n"));