[Pkg-gnupg-commit] [gnupg2] 49/118: g10: End transaction earlier.

[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 85fad6c34c08b2850580e0644faba62d3a501b84
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Sep 1 23:31:53 2016 +0200

    g10: End transaction earlier.
    
    * g10/tofu.c (ask_about_binding): End the transaction earlier.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/tofu.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index 2ac6065..75df30a 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -1414,6 +1414,7 @@ ask_about_binding (ctrl_t ctrl,
      " order by fingerprint = ? asc, fingerprint desc, time_ago desc;\n",
      GPGSQL_ARG_STRING, email, GPGSQL_ARG_STRING, fingerprint,
      GPGSQL_ARG_END);
+  end_transaction (ctrl, 0);
   if (rc)
     {
       strlist_t strlist_iter;
@@ -1680,8 +1681,6 @@ ask_about_binding (ctrl_t ctrl,
         }
     }
 
-  end_transaction (ctrl, 0);
-
   if ((*policy == TOFU_POLICY_NONE && bindings_with_this_email_count > 0)
       || (*policy == TOFU_POLICY_ASK
           && (conflict || bindings_with_this_email_count > 0)))

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