[Pkg-gnupg-commit] [gnupg2] 39/185: gpg: Avoid failure exit when scdaemon is disabled but not needed.

[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 17e5afd80f247c356f03c71e8b61da424ffedabb
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 5 11:57:02 2017 +0200

    gpg: Avoid failure exit when scdaemon is disabled but not needed.
    
    * g10/call-agent.c (warn_version_mismatch): Use log_info if error is
    "not supported".
    --
    
    This fix may make the fix for
    GnuPG-bug-id: 3192
    even more robust.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/call-agent.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/g10/call-agent.c b/g10/call-agent.c
index e6dbb73..7b76933 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -194,8 +194,10 @@ warn_version_mismatch (assuan_context_t ctx, const char *servername, int mode)
 
   err = get_assuan_server_version (ctx, mode, &serverversion);
   if (err)
-    log_error (_("error getting version from '%s': %s\n"),
-               servername, gpg_strerror (err));
+    log_log (gpg_err_code (err) == GPG_ERR_NOT_SUPPORTED?
+             GPGRT_LOG_INFO : GPGRT_LOG_ERROR,
+             _("error getting version from '%s': %s\n"),
+             servername, gpg_strerror (err));
   else if (compare_version_strings (serverversion, myversion) < 0)
     {
       char *warn;

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