[Pkg-gnupg-commit] [gnupg2] 16/112: g10: Drop superfluous begin transaction.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch master
in repository gnupg2.

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>
---
 g10/tofu.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

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

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