[git] GnuPG - branch, master, updated. gnupg-2.1.15-94-g30a9f53

[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, master has been updated
       via  30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a (commit)
      from  a8363b7d0bcc77b55226d5fe8f972214c968ddc3 (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 30a9f53a0f2af6b98c26b8ddc0b4b87c38416f2a
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Sep 8 14:34:07 2016 +0200

    gpg: Remove option --yes from gpgv
    
    * g10/gpgv.c (opts): Remove --yes.
    (main): Always set opt.ANSWER_YES.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpgv.texi b/doc/gpgv.texi
index 6676bde..9a74c27 100644
--- a/doc/gpgv.texi
+++ b/doc/gpgv.texi
@@ -95,12 +95,12 @@ home-directory ("~/.gnupg" if --homedir is not used).
 @item --output @var{file}
 @itemx -o @var{file}
 @opindex output
-Write output to @var{file}.  This option can be used to get the signed
-text from a cleartext or binary signature; it also works for detached
-signatures, but in that case this option is in general not
-useful. Unless you write to stdout (using @code{-} for @var{file}) you
-should also use the option @option{--yes} to force overwriting an
-existing file.
+Write output to @var{file}; to write to stdout use @code{-}.  This
+option can be used to get the signed text from a cleartext or binary
+signature; it also works for detached signatures, but in that case
+this option is in general not useful.  Note that an existing file will
+be overwritten.
+
 
 @item --status-fd @var{n}
 @opindex status-fd
diff --git a/g10/gpgv.c b/g10/gpgv.c
index aa1fcea..2f34e72 100644
--- a/g10/gpgv.c
+++ b/g10/gpgv.c
@@ -63,8 +63,6 @@ enum cmd_and_opt_values {
   oLoggerFD,
   oHomedir,
   oWeakDigest,
-  oAnswerYes,
-  oAnswerNo,
   aTest
 };
 
@@ -85,7 +83,6 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_s_s (oHomedir, "homedir", "@"),
   ARGPARSE_s_s (oWeakDigest, "weak-digest",
                 N_("|ALGO|reject signatures made with ALGO")),
-  ARGPARSE_s_n (oAnswerYes, "yes", "@"),
 
   ARGPARSE_end ()
 };
@@ -170,6 +167,7 @@ main( int argc, char **argv )
   opt.no_sig_cache = 1;
   opt.flags.require_cross_cert = 1;
   opt.batch = 1;
+  opt.answer_yes = 1;
 
   opt.weak_digests = NULL;
 
@@ -194,7 +192,6 @@ main( int argc, char **argv )
           break;
         case oKeyring: append_to_strlist( &nrings, pargs.r.ret_str); break;
         case oOutput: opt.outfile = pargs.r.ret_str; break;
-        case oAnswerYes: opt.answer_yes = 1; break;
         case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
         case oLoggerFD:
           log_set_fd (translate_sys2libc_fd_int (pargs.r.ret_int, 1));

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

Summary of changes:
 doc/gpgv.texi | 12 ++++++------
 g10/gpgv.c    |  5 +----
 2 files changed, 7 insertions(+), 10 deletions(-)


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