[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.20-24-g7c028ef

[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-2-0 has been updated
       via  7c028efc182234cd28bbfbeccff0107f334064f2 (commit)
      from  4f90c7b914693b72341fa1e93dda7e075f9717c0 (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 7c028efc182234cd28bbfbeccff0107f334064f2
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Aug 2 09:10:17 2013 +0200

    gpg: No need to create a trustdb when encrypting with --always-trust.
    
    * g10/gpg.c (main): Special case setup_trustdb for --encrypt.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    (cherry picked from commit 498b9a95dc65c43240835d64cc92d8fb43014d53)

diff --git a/g10/gpg.c b/g10/gpg.c
index ffe964e..1238f47 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -3389,7 +3389,8 @@ main (int argc, char **argv)
     if(fname && utf8_strings)
       opt.flags.utf8_filename=1;
 
-    switch( cmd ) {
+    switch (cmd)
+      {
       case aPrimegen:
       case aPrintMD:
       case aPrintMDs:
@@ -3398,12 +3399,24 @@ main (int argc, char **argv)
       case aEnArmor:
 	break;
       case aFixTrustDB:
-      case aExportOwnerTrust: rc = setup_trustdb( 0, trustdb_name ); break;
-      case aListTrustDB: rc = setup_trustdb( argc? 1:0, trustdb_name ); break;
-      default: rc = setup_trustdb(1, trustdb_name ); break;
-    }
-    if( rc )
-	log_error(_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
+      case aExportOwnerTrust:
+        rc = setup_trustdb (0, trustdb_name);
+        break;
+      case aListTrustDB:
+        rc = setup_trustdb (argc? 1:0, trustdb_name);
+        break;
+      case aEncr:
+      case aEncrFiles:
+        /* If we are using TM_ALWAYS, we do not need to create the
+           trustdb.  */
+        rc = setup_trustdb (opt.trust_model != TM_ALWAYS, trustdb_name);
+        break;
+      default:
+        rc = setup_trustdb (1, trustdb_name );
+        break;
+      }
+    if (rc)
+      log_error (_("failed to initialize the TrustDB: %s\n"), g10_errstr(rc));
 
 
     switch (cmd)

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

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


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