[Pkg-gnupg-commit] [gnupg2] 102/205: agent: allow removal of the shadowed key.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

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>
---
 agent/findkey.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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:

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