[git] GnuPG - branch, master, updated. gnupg-2.1.10-13-gb5cd688

[by Daiki Ueno]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9 (commit)
      from  6d64ef869dfbcb7aaa802b80ed648393147e40d8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b5cd68852d0e3485c9e13a8ddb70f05f36a65cb9
Author: Daiki Ueno <ueno at gnu.org>
Date:   Mon Nov 9 13:20:13 2015 +0900

    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

diff --git a/g10/delkey.c b/g10/delkey.c
index b0a2b0d..5d0c3df 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;
+		    }
                 }
 
             }

-----------------------------------------------------------------------

Summary of changes:
 g10/delkey.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org