[Pkg-gnupg-commit] [gnupg2] 52/205: common/exechelp: Mute the Windows version.

[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 54acc87c1e0b100accbfd02cfce59a897f2f0ce1
Author: Justus Winter <justus at g10code.com>
Date:   Thu Feb 4 17:03:48 2016 +0100

    common/exechelp: Mute the Windows version.
    
    * common/exechelp-w32.c (gnupg_wait_process): Do not print an error if
    the exit code can be returned.  This makes the Windows version behave
    like the POSIX version.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 common/exechelp-w32.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/common/exechelp-w32.c b/common/exechelp-w32.c
index 11bcea7..a77e27c 100644
--- a/common/exechelp-w32.c
+++ b/common/exechelp-w32.c
@@ -713,9 +713,10 @@ gnupg_wait_process (const char *pgmname, pid_t pid, int hang, int *r_exitcode)
         }
       else if (exc)
         {
-          log_error (_("error running '%s': exit status %d\n"),
-                     pgmname, (int)exc );
-          if (r_exitcode)
+          if (!r_exitcode)
+            log_error (_("error running '%s': exit status %d\n"),
+                       pgmname, (int)exc);
+          else
             *r_exitcode = (int)exc;
           ec = GPG_ERR_GENERAL;
         }

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