[git] GnuPG - branch, master, updated. gnupg-2.1.9-28-g445f94b

by Neal H. Walfield cvs at cvs.gnupg.org
Tue Oct 20 13:50:38 CEST 2015


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, master has been updated
       via  445f94bc81b20959a667a4ad80ea6c73059540bf (commit)
       via  4957e3236796979b58f35628351505ea5f4e936a (commit)
      from  eb8a0b051faa03584b3820200e10301936e82f51 (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 445f94bc81b20959a667a4ad80ea6c73059540bf
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 13:42:20 2015 +0200

    gpg: Improve text.
    
    * g10/tofu.c (show_statistics): Improve text.
    
    --
    Signed-off-by: Neal H. Walfield <neal at walfield.org>
    Suggested-by: Malte <malte at wk3.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index f9aa68f..d34a204 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2005,14 +2005,16 @@ show_statistics (struct db *dbs, const char *fingerprint,
 		 directly internationalize that text so that we can
 		 tweak it without breaking translations.  */
 	      text = _("TOFU: few signatures %s");
-	      if (strcmp (text, "TOFU: few signatures %s") == 0)
+	      if (strcmp (text, "TOFU: few signatures %d %s %s") == 0)
 		text =
-		  "Warning: if this value is unexpectedly low, this might "
-		  "indicate that this key is a forgery!  Carefully examine "
-		  "the email address for small variations (e.g., additional "
-		  "white space).  If the key is suspect, then use '%s' to "
-		  "mark the key as being bad.\n";
-	      log_info (text, set_policy_command);
+		  "Warning: if you think you've seen more than %d %s "
+		  "signed by this key, then this key might be a forgery!  "
+		  "Carefully examine the email address for small variations "
+		  "(e.g., additional white space).  If the key is suspect, "
+		  "then use '%s' to mark it as being bad.\n";
+	      log_info (text,
+			messages, messages == 1 ? _("message") : _("message"),
+			set_policy_command);
 	      free (set_policy_command);
 	    }
 	}

commit 4957e3236796979b58f35628351505ea5f4e936a
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 13:40:37 2015 +0200

    gpg: Use the right variable to display the information.
    
    * g10/tofu.c (get_trust): Use the right variable to display the
    conflicting key.
    
    --
    Signed-off-by: Neal H. Walfield <neal at walfield.org>
    Reported-by: Andre Heinecke <aheinecke at intevation.de>

diff --git a/g10/tofu.c b/g10/tofu.c
index f97a3f7..f9aa68f 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1456,9 +1456,10 @@ get_trust (struct db *dbs, const char *fingerprint, const char *email,
 	     && conflict && strcmp (conflict, fingerprint) != 0)
       {
 	es_fprintf (fp,
-		    _("%s raised a conflict with this binding.  Since this"
-		      " binding's policy was 'auto', it was changed to 'ask'.  "),
-		    binding);
+		    _("The key %s raised a conflict with this binding.  Since"
+                      " this binding's policy was 'auto', it was changed to "
+                      "'ask'.  "),
+		    conflict);
 	binding_shown = 1;
       }
     es_fprintf (fp,

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

Summary of changes:
 g10/tofu.c | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)


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




More information about the Gnupg-commits mailing list