[git] GnuPG - branch, master, updated. gnupg-2.1.9-32-g26d457c

[by Neal H. Walfield]

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  26d457c218c2e93b2e2cf316f0c1074c70894d0f (commit)
      from  bc9ff6c85e2d89be4ee873b8a72a214759a66157 (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 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>

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);
 

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

Summary of changes:
 g10/tofu.c | 4 ++++
 1 file changed, 4 insertions(+)


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