[Pkg-gnupg-commit] [gnupg2] 217/241: gpg: Add variant of 'key "%s" not found: %s' error message.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

commit 5e2c5e9ec5b75fae886e1294adbdb7ad2ac12827
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 3 12:25:37 2015 +0100

    gpg: Add variant of 'key "%s" not found: %s' error message.
    
    * g10/gpg.c (check_user_ids): Change error message.
    * g10/delkey.c (do_delete_key): Ditto.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/delkey.c | 2 +-
 g10/gpg.c    | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/g10/delkey.c b/g10/delkey.c
index b8c03a1..b0a2b0d 100644
--- a/g10/delkey.c
+++ b/g10/delkey.c
@@ -116,7 +116,7 @@ do_delete_key( const char *username, int secret, int force, int *r_sec_avail )
   if (secret && !have_secret_key_with_kid (keyid))
     {
       err = gpg_error (GPG_ERR_NOT_FOUND);
-      log_error (_("key \"%s\" not found: %s\n"), username, gpg_strerror (err));
+      log_error (_("key \"%s\" not found\n"), username);
       write_status_text (STATUS_DELETE_PROBLEM, "1");
       goto leave;
     }
diff --git a/g10/gpg.c b/g10/gpg.c
index 34d436f..93090eb 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2177,8 +2177,7 @@ check_user_ids (strlist_t *sp,
               if (! rc)
                 rc = err;
 
-              log_error (_("key \"%s\" not found: %s\n"),
-                         t->d, gpg_strerror (err));
+              log_error (_("key \"%s\" not found\n"), t->d);
               if (!opt.quiet)
                 log_info (_("(check argument of option '%s')\n"), option);
             }

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