[Pkg-gnupg-commit] [gnupg2] 153/241: gpg: Improve an 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 46e128d44a0456dc603bc9e25a4c5d8da903b078
Author: Neal H. Walfield <neal at g10code.com>
Date:   Fri Nov 20 12:17:13 2015 +0100

    gpg: Improve an error message.
    
    * g10/revoke.c (gen_revoke): Provide a more descriptive error message
    if searching for a key fails.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
    GnuPG-bug-id: 1987
---
 g10/revoke.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/g10/revoke.c b/g10/revoke.c
index 460f346..0ed2604 100644
--- a/g10/revoke.c
+++ b/g10/revoke.c
@@ -614,8 +614,12 @@ gen_revoke (const char *uname)
     rc = keydb_search (kdbhd, &desc, 1, NULL);
   if (rc)
     {
-      log_error (_("secret key \"%s\" not found: %s\n"),
-                 uname, gpg_strerror (rc));
+      if (gpg_err_code (rc) == GPG_ERR_NOT_FOUND)
+        log_error (_("no secret key matches the search term \"%s\"\n"),
+                     uname);
+      else
+        log_error (_("error looking up secret key \"%s\": %s\n"),
+                   uname, gpg_strerror (rc));
       goto leave;
     }
 

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