[git] GnuPG - branch, master, updated. gnupg-2.1.11-114-gdd5902c

[by Justus Winter]

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  dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c (commit)
      from  42d4c2762f7ae5b009b62963e6595bdec9df6859 (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 dd5902cc45bae7582f8a0bc91a0a7f4d8ae45d8c
Author: Justus Winter <justus at g10code.com>
Date:   Mon Apr 4 13:10:28 2016 +0200

    tests: Fix default key test.
    
    * tests/openpgp/default-key.test: Avoid using the option
    '--trust-model' unconditionally.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/tests/openpgp/default-key.test b/tests/openpgp/default-key.test
index 567f38d..83e4f79 100755
--- a/tests/openpgp/default-key.test
+++ b/tests/openpgp/default-key.test
@@ -55,13 +55,13 @@ do
     #
     # Note: it doesn't matter whether we specify the primary key or
     # a subkey: the newest encryption subkey will be used.
-    if ! echo | $GPG --trust-model=always \
+    if ! echo | $GPG ${opt_always} \
                      --default-key "$x" --encrypt-to-default-key \
                      -r 439F02CA -e \
             | $GPG --list-packets \
             | grep "keyid[ ][A-F0-9]*45117079" >/dev/null
     then
-        echo | $GPG --trust-model=always \
+        echo | $GPG ${opt_always} \
                     --default-key "$x" --encrypt-to-default-key \
                     -r 439F02CA -e \
             | $GPG --list-packets 1>&2

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

Summary of changes:
 tests/openpgp/default-key.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


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