Description: Revert broken trustdb creation change
 Revert the following upstream patch that causes --always-trust not to
 create trustdb because GnuPG then complains that the file is required.
 This breaks popularity-contest 1.60.
 Next upstream release will include a patch 
 (2528178e7e2fac6454dd988121167305db7c71d9) that remove the check for
 trustdb when --always-trust is used (the file is not actually used).

Author: Bill Allombert <ballombe@debian.org>
Origin: upstream-reverted
Bug-Debian: http://bugs.debian.org/725889
Last-Update: 2013-10-16

From a1a59e6a539e597996976d0afb6aa3062e954188 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Fri, 2 Aug 2013 09:17:52 +0200
Subject: [PATCH 1/1] gpg: No need to create a trustdb when encrypting with
 --always-trust.

* g10/gpg.c (main): Special case setup_trustdb for --encrypt.
--

(back ported from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 g10/gpg.c |    6 ++++++
 1 file changed, 6 insertions(+)

Index: gnupg-1.4.15/g10/gpg.c
===================================================================
--- gnupg-1.4.15.orig/g10/gpg.c	2013-10-04 20:34:26.000000000 +0200
+++ gnupg-1.4.15/g10/gpg.c	2013-10-16 13:11:38.999258014 +0200
@@ -3318,12 +3318,6 @@
       case aFixTrustDB:
       case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
       case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
-      case aEncr:
-      case aEncrFiles:
-        /* No need to create the trust model if we are using the
-         * always trust model.  */
-        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
-        break;
       default: rc = setup_trustdb(1, trustdb_name ); break;
     }
     if( rc )
