[Pkg-gnupg-commit] [gnupg2] 13/159: gpg: Write ERROR status on delete-key cancellation

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Jan 27 13:23:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

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
---
 g10/delkey.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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;
+		    }
                 }
 
             }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git



More information about the Pkg-gnupg-commit mailing list