[Pkg-gnupg-commit] [gnupg2] 111/205: g10: Remove option --always-trust if compiled without trust models.

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit b74185b6eaeaae4754726ff203e11977777f568c
Author: Justus Winter <justus at g10code.com>
Date:   Fri Apr 1 14:51:56 2016 +0200

    g10: Remove option --always-trust if compiled without trust models.
    
    * g10/gpg.c (opts): Remove option --always-trust if compiled without
    trust models.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 g10/gpg.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/g10/gpg.c b/g10/gpg.c
index 330d5a3..b9d69a7 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -681,7 +681,9 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_n (oSkipHiddenRecipients, "skip-hidden-recipients", "@"),
   ARGPARSE_s_n (oNoSkipHiddenRecipients, "no-skip-hidden-recipients", "@"),
   ARGPARSE_s_i (oDefCertLevel, "default-cert-check-level", "@"), /* old */
+#ifndef NO_TRUST_MODELS
   ARGPARSE_s_n (oAlwaysTrust, "always-trust", "@"),
+#endif
   ARGPARSE_s_s (oTrustModel, "trust-model", "@"),
   ARGPARSE_s_s (oTOFUDefaultPolicy, "tofu-default-policy", "@"),
   ARGPARSE_s_s (oTOFUDBFormat, "tofu-db-format", "@"),

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