[git] GnuPG - branch, master, updated. gnupg-2.1.9-31-gbc9ff6c

by Neal H. Walfield cvs at cvs.gnupg.org
Tue Oct 20 14:54:28 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  bc9ff6c85e2d89be4ee873b8a72a214759a66157 (commit)
       via  251c070f91e2c65baa3f1195f14a176440a8aafa (commit)
       via  d3eca517745a862432fcfeaa729e5333b15ffa6a (commit)
      from  445f94bc81b20959a667a4ad80ea6c73059540bf (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 bc9ff6c85e2d89be4ee873b8a72a214759a66157
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 14:53:29 2015 +0200

    gpg: Improve output.
    
    * g10/tofu.c (get_trust): Also show the binding when indicating a
    conflict occurred.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

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

commit 251c070f91e2c65baa3f1195f14a176440a8aafa
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 14:52:39 2015 +0200

    gpg: Synchronize translation template.
    
    * g10/tofu.c (show_statistics): Synchronize translation template.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 5886c5e..0b5fa29 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2018,7 +2018,7 @@ show_statistics (struct db *dbs, const char *fingerprint,
 	      /* TRANSLATORS: translate the below text.  We don't
 		 directly internationalize that text so that we can
 		 tweak it without breaking translations.  */
-	      text = _("TOFU: few signatures %s");
+	      text = _("TOFU: few signatures %d %s %s");
 	      if (strcmp (text, "TOFU: few signatures %d %s %s") == 0)
 		text =
 		  "Warning: if you think you've seen more than %d %s "

commit d3eca517745a862432fcfeaa729e5333b15ffa6a
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 14:50:21 2015 +0200

    gpg: When showing conflicts, also show bindings with no recorded sigs.
    
    * g10/tofu.c (signature_stats_collect_cb): If the time_ago column is
    NULL, then both time_ago and count should be 0.
    (get_trust): Reverse the direction of the join so that we also get
    statistics about bindings without any signatures.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index d34a204..5886c5e 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1061,27 +1061,39 @@ signature_stats_collect_cb (void *cookie, int argc, char **argv,
     }
   i ++;
 
-  tail = NULL;
-  errno = 0;
-  time_ago = strtol (argv[i], &tail, 0);
-  if (errno || ! (strcmp (tail, ".0") == 0 || *tail == '\0'))
+  if (! argv[i])
+    time_ago = 0;
+  else
     {
-      /* Abort.  */
-      log_error ("%s: Error converting %s to an integer (tail = '%s')\n",
-		 __func__, argv[i], tail);
-      return 1;
+      tail = NULL;
+      errno = 0;
+      time_ago = strtol (argv[i], &tail, 0);
+      if (errno || ! (strcmp (tail, ".0") == 0 || *tail == '\0'))
+        {
+          /* Abort.  */
+          log_error ("%s: Error converting %s to an integer (tail = '%s')\n",
+                     __func__, argv[i], tail);
+          return 1;
+        }
     }
   i ++;
 
-  tail = NULL;
-  errno = 0;
-  count = strtoul (argv[i], &tail, 0);
-  if (errno || ! (strcmp (tail, ".0") == 0 || *tail == '\0'))
+  /* If time_ago is NULL, then we had no messages, but we still have a
+     single row, which count(*) turns into 1.  */
+  if (! argv[i - 1])
+    count = 0;
+  else
     {
-      /* Abort.  */
-      log_error ("%s: Error converting %s to an integer (tail = '%s')\n",
-		 __func__, argv[i], tail);
-      return 1;
+      tail = NULL;
+      errno = 0;
+      count = strtoul (argv[i], &tail, 0);
+      if (errno || ! (strcmp (tail, ".0") == 0 || *tail == '\0'))
+        {
+          /* Abort.  */
+          log_error ("%s: Error converting %s to an integer (tail = '%s')\n",
+                     __func__, argv[i], tail);
+          return 1;
+        }
     }
   i ++;
 
@@ -1551,10 +1563,12 @@ get_trust (struct db *dbs, const char *fingerprint, const char *email,
        "         else round(delta / %d) * %d\n"
        "        end time_ago,\n"
        "        delta time_ago_raw\n"
-       "       from (select *,\n"
-       "              cast(strftime('%%s','now') - sig_time as real) delta\n"
-       "             from signatures) ss\n"
-       "       left join bindings on ss.binding = bindings.oid)\n"
+       "       from bindings\n"
+       "       left join\n"
+       "         (select *,\n"
+       "            cast(strftime('%%s','now') - sig_time as real) delta\n"
+       "           from signatures) ss\n"
+       "        on ss.binding = bindings.oid)\n"
        " where email = %Q\n"
        " group by fingerprint, time_ago\n"
        /* Make sure the current key is first.  */

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

Summary of changes:
 g10/tofu.c | 64 ++++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 25 deletions(-)


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




More information about the Gnupg-commits mailing list