[Pkg-gnupg-commit] [gnupg2] 18/118: g10: Print the info text in more situations.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 4c2abb221b29c9e8e0876fe986472b562ee1c99f
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Aug 30 11:29:52 2016 +0200

    g10: Print the info text in more situations.
    
    * g10/tofu.c (ask_about_binding): Print the info text when the policy
    is ask and there are multiple bindings with the email address.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/tofu.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index e433f79..e15b564 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1372,7 +1372,8 @@ ask_about_binding (tofu_dbs_t dbs,
 
 
   if ((*policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0)
-      || (*policy == TOFU_POLICY_ASK && conflict))
+      || (*policy == TOFU_POLICY_ASK
+          && (conflict || bindings_with_this_email_count > 0)))
     {
       /* This is a conflict.  */
 

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