From b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 9 Nov 2015 13:20:13 +0900 Subject: gpg: Write ERROR status on delete-key cancellation * g10/delkey.c (do_delete_key): Write ERROR status code with the error location "delete_key.secret", when the user cancelled the operation on Pinentry. -- I changed the original patch to emit the full gpg_error_t code. -wk --- g10/delkey.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/g10/delkey.c b/g10/delkey.c index b0a2b0d55..5d0c3dffb 100644 --- a/g10/delkey.c +++ b/g10/delkey.c @@ -201,7 +201,10 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail ) firsterr = err; if (gpg_err_code (err) == GPG_ERR_CANCELED || gpg_err_code (err) == GPG_ERR_FULLY_CANCELED) - break; + { + write_status_error ("delete_key.secret", err); + break; + } } } -- cgit v1.2.3