[git] GnuPG - branch, master, updated. gnupg-2.1.14-17-g45bb9a2

[by Justus Winter]

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  45bb9a2a46e11bc13c6b39e7b4748b7de199018e (commit)
       via  8a6f8e1e397a2d676b211f2dbc6df4a80b67442d (commit)
       via  699c6c9f4b44441ab3db7f942df5b81f4cd88b06 (commit)
       via  7207b2fe45bcf884e029366a2677a570234bed2e (commit)
      from  1af2fd44f0a66fd0d94c224319db0b128d42a288 (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 45bb9a2a46e11bc13c6b39e7b4748b7de199018e
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 21 18:22:18 2016 +0200

    g10: Fix error handling.
    
    * g10/tofu.c (show_statistics): Fix error handling, 0 is a valid
    duration.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 847c023..a2732ff 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2504,12 +2504,12 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
         }
       else
 	{
-          string_to_long (&first_seen_ago, strlist->next->d, 0, __LINE__);
-	  string_to_long (&most_recent_seen_ago, strlist->next->next->d, 0,
+          string_to_long (&first_seen_ago, strlist->next->d, -1, __LINE__);
+	  string_to_long (&most_recent_seen_ago, strlist->next->next->d, -1,
                           __LINE__);
 	}
 
-      if (messages == -1 || first_seen_ago == 0)
+      if (messages == -1 || first_seen_ago == -1)
         {
           write_stats_status (0, TOFU_POLICY_NONE, -1, -1);
           log_info (_("Failed to collect signature statistics for \"%s\"\n"

commit 8a6f8e1e397a2d676b211f2dbc6df4a80b67442d
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 21 18:07:22 2016 +0200

    g10: Drop superfluous begin transaction.
    
    * g10/tofu.c (record_binding): We only need a transaction for the
    split format.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 0b9d848..847c023 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1199,6 +1199,7 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
        only place where we start two transaction and we always start
        transaction on the DB_KEY DB first, thus deadlock is not
        possible.  */
+    /* We only need a transaction for the split format.  */
     {
       db_key = getdb (dbs, fingerprint, DB_KEY);
       if (! db_key)
@@ -1215,13 +1216,6 @@ record_binding (tofu_dbs_t dbs, const char *fingerprint, const char *email,
       if (rc)
         goto out_revert_one;
     }
-  else
-    {
-      rc = begin_transaction (db_email, 1);
-      if (rc)
-        goto leave;
-    }
-
 
   if (show_old)
     /* Get the old policy.  Since this is just for informational

commit 699c6c9f4b44441ab3db7f942df5b81f4cd88b06
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 21 18:05:58 2016 +0200

    gpgscm: Make assert macro more accurate.
    
    * tests/gpgscm/lib.scm (assert): Print the representation of the
    failed expression.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/lib.scm b/tests/gpgscm/lib.scm
index e23977a..fe28262 100644
--- a/tests/gpgscm/lib.scm
+++ b/tests/gpgscm/lib.scm
@@ -20,7 +20,8 @@
 (macro (assert form)
   `(if (not ,(cadr form))
        (begin
-	 (display (list "Assertion failed:" (quote ,(cadr form))))
+	 (display "Assertion failed: ")
+	 (write (quote ,(cadr form)))
 	 (newline)
 	 (exit 1))))
 (assert #t)

commit 7207b2fe45bcf884e029366a2677a570234bed2e
Author: Justus Winter <justus at g10code.com>
Date:   Thu Jul 21 18:04:57 2016 +0200

    gpgscm: Make error message more useful.
    
    * tests/gpgscm/scheme.c (opexe_0): Include names of missing function
    parameters in the error message.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/gpgscm/scheme.c b/tests/gpgscm/scheme.c
index 0a76205..987f5af 100644
--- a/tests/gpgscm/scheme.c
+++ b/tests/gpgscm/scheme.c
@@ -2743,7 +2743,7 @@ static pointer opexe_0(scheme *sc, enum scheme_opcodes op) {
                for (x = car(closure_code(sc->code)), y = sc->args;
                     is_pair(x); x = cdr(x), y = cdr(y)) {
                     if (y == sc->NIL) {
-                         Error_0(sc,"not enough arguments");
+                         Error_1(sc, "not enough arguments, missing:", x);
                     } else {
                          new_slot_in_env(sc, car(x), car(y));
                     }

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

Summary of changes:
 g10/tofu.c            | 14 ++++----------
 tests/gpgscm/lib.scm  |  3 ++-
 tests/gpgscm/scheme.c |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)


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