summaryrefslogtreecommitdiff
path: root/g10/delkey.c
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2021-02-09 16:00:51 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2021-02-09 16:00:51 +0900
commitc77baaa6ab6a9a716376da8a07034c4d4ca89d4e (patch)
tree4c9c15b1328928edfef64828dca435df45232949 /g10/delkey.c
parent1ef93b7351cb8e1f36011fc9510443a4dc683b6c (diff)
downloadgpg2-c77baaa6ab6a9a716376da8a07034c4d4ca89d4e.tar.gz
gpg2-c77baaa6ab6a9a716376da8a07034c4d4ca89d4e.tar.bz2
gpg2-c77baaa6ab6a9a716376da8a07034c4d4ca89d4e.zip
Imported Upstream version 2.2.20upstream/2.2.20
Diffstat (limited to 'g10/delkey.c')
-rw-r--r--g10/delkey.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/g10/delkey.c b/g10/delkey.c
index 6116d74..13dbcf0 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"
@@ -368,6 +369,11 @@ delete_keys (ctrl_t ctrl, strlist_t names, int secret, int allow_both)
{
log_error ("%s: delete key failed: %s\n",
names->d, gpg_strerror (err));
+ if (gpg_err_code (err) == GPG_ERR_NO_PIN_ENTRY
+ && opt.batch && secret
+ && opt.pinentry_mode == PINENTRY_MODE_LOOPBACK)
+ log_info ("(try option \"--yes\" to delete anyway)\n");
+
return err;
}
}