[git] GnuPG - branch, master, updated. gnupg-2.1.11-102-g8588c2d

[by NIIBE Yutaka]

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  8588c2dbc4c4d1b53796f3dbe8489b932dca7a60 (commit)
      from  b752d2c93778e6a1c1de3eddf8fc725b0ddd354e (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 8588c2dbc4c4d1b53796f3dbe8489b932dca7a60
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 17 08:37:58 2016 +0900

    agent: allow removal of the shadowed key.
    
    * agent/findkey.c (agent_delete_key): Remove the key when asked.
    
    --
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/agent/findkey.c b/agent/findkey.c
index c5e7ae7..3cf8d0c 100644
--- a/agent/findkey.c
+++ b/agent/findkey.c
@@ -1311,7 +1311,7 @@ agent_delete_key (ctrl_t ctrl, const char *desc_text,
       break;
 
     case PRIVATE_KEY_SHADOWED:
-      err = gpg_error (GPG_ERR_KEY_ON_CARD);
+      err = remove_key_file (grip);
       break;
 
     default:

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

Summary of changes:
 agent/findkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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