[Pkg-gnupg-commit] [gnupg2] 32/241: gpg: Don't die immediately if the TOFU DB is locked.

[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 26d457c218c2e93b2e2cf316f0c1074c70894d0f
Author: Neal H. Walfield <neal at g10code.com>
Date:   Tue Oct 20 15:12:23 2015 +0200

    gpg: Don't die immediately if the TOFU DB is locked.
    
    * g10/tofu.c (opendb): Don't die immediately if the DB is locked.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>
---
 g10/tofu.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/g10/tofu.c b/g10/tofu.c
index 3f2cd25..4ad44eb 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -487,6 +487,10 @@ opendb (char *filename, enum db_type type)
       db = NULL;
     }
 
+  /* If a DB is locked wait up to 5 seconds for the lock to be cleared
+     before failing.  */
+  sqlite3_busy_timeout (db, 5 * 1000);
+
   if (filename_free)
     xfree (filename);
 

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