[Pkg-gnupg-commit] [gnupg2] 71/241: w32: Make it build again if Tofu support is not available.

Daniel Kahn Gillmor dkg at fifthhorseman.net
Wed Dec 9 20:31:56 UTC 2015


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

dkg pushed a commit to branch master
in repository gnupg2.

commit 0d37a40fc34519e93af3ceffff2cd726d29576d3
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Oct 26 16:38:41 2015 +0100

    w32: Make it build again if Tofu support is not available.
    
    * g10/keylist.c (public_key_list) [!USE_TOFU]: Do not call tofu
    functions.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/keylist.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/g10/keylist.c b/g10/keylist.c
index d4e6b74..509cf7c 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -132,7 +132,9 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
      which is associated with the inode of a deleted file.  */
   check_trustdb_stale ();
 
+#ifdef USE_TOFU
   tofu_begin_batch_update ();
+#endif
 
   if (locate_mode)
     locate_one (ctrl, list);
@@ -141,7 +143,9 @@ public_key_list (ctrl_t ctrl, strlist_t list, int locate_mode)
   else
     list_one (ctrl, list, 0, opt.with_secret);
 
+#ifdef USE_TOFU
   tofu_end_batch_update ();
+#endif
 }
 
 

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



More information about the Pkg-gnupg-commit mailing list