[git] GnuPG - branch, STABLE-BRANCH-1-4, updated. gnupg-1.4.14-2-ga1a59e6

[by Werner Koch]

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, STABLE-BRANCH-1-4 has been updated
       via  a1a59e6a539e597996976d0afb6aa3062e954188 (commit)
      from  6f634b0e089f253f07a470670449ba0722408d46 (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 a1a59e6a539e597996976d0afb6aa3062e954188
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 09:17:52 2013 +0200

    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 at gnupg.org>

diff --git a/g10/gpg.c b/g10/gpg.c
index 96f9086..b310308 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3318,6 +3318,12 @@ main (int argc, char **argv )
       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 )

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

Summary of changes:
 g10/gpg.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


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