[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.11-21-gf7ff25e

[by Werner Koch]

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, STABLE-BRANCH-2-2 has been updated
       via  f7ff25edadd474f83fccba6fd3c410eb8358bb22 (commit)
      from  dfcc5e6d3ec91f547feb78e442946e729b49878c (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 f7ff25edadd474f83fccba6fd3c410eb8358bb22
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Dec 11 12:29:58 2018 +0100

    gpg: In search-keys return "Not found" instead of "No Data".
    
    * g10/keyserver.c (keyserver_search): Check for NO_DATA.
    --
    
    GnuPG-bug-id: 3830
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit e7252ae57f3c9da557f23295268f74dd25fee3a1)

diff --git a/g10/keyserver.c b/g10/keyserver.c
index a8c222d..8509d83 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1528,7 +1528,7 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
 
   err = gpg_dirmngr_ks_search (ctrl, searchstr, search_line_handler, &parm);
 
-  if (parm.not_found)
+  if (parm.not_found || gpg_err_code (err) == GPG_ERR_NO_DATA)
     {
       if (parm.searchstr_disp)
         log_info (_("key \"%s\" not found on keyserver\n"),
@@ -1539,6 +1539,8 @@ keyserver_search (ctrl_t ctrl, strlist_t tokens)
 
   if (gpg_err_code (err) == GPG_ERR_NO_KEYSERVER)
     log_error (_("no keyserver known (use option --keyserver)\n"));
+  else if (gpg_err_code (err) == GPG_ERR_NO_DATA)
+    err = gpg_error (GPG_ERR_NOT_FOUND);
   else if (err)
     log_error ("error searching keyserver: %s\n", gpg_strerror (err));
 

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

Summary of changes:
 g10/keyserver.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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