[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.6-9-ge2bd152

[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  e2bd152a928d79ddfb95fd2f7911c80a1a8d5a21 (commit)
      from  bbb5bfacc0d1f179cfec94fd32fee01a09df0f1d (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 e2bd152a928d79ddfb95fd2f7911c80a1a8d5a21
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Apr 12 11:49:36 2018 +0200

    gpg: Relax printing of STATUS_FAILURE.
    
    * g10/gpg.c (g10_exit): Print STATUS_FAILURE only based on passed
    return code and not on the presence of any call to log_error.
    --
    
    This fixes an actual regression in GPGME where FAILURE is considered
    for example by a signature verify operation.  The operation will simply
    fail and not just record that that a signature could not be verified.
    In particular for files with more than one signature a log_error if
    often called to show that a pubkey is missing for one of the
    signatures.  Using that log_error is correct in that case.
    
    Fixes-commit: 0336e5d1a7b9d46e06c838e6a98aecfcc9542882
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index fbbdd92..aaeddee 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -5111,7 +5111,7 @@ g10_exit( int rc )
   /* If we had an error but not printed an error message, do it now.
    * Note that write_status_failure will never print a second failure
    * status line. */
-  if (log_get_errorcount (0))
+  if (rc)
     write_status_failure ("gpg-exit", gpg_error (GPG_ERR_GENERAL));
 
   gcry_control (GCRYCTL_UPDATE_RANDOM_SEED_FILE);

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

Summary of changes:
 g10/gpg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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