[git] GnuPG - branch, master, updated. gnupg-2.2.7-145-gd2bc66f

[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  d2bc66f241a66cc95140cbb3a07555f6301290ed (commit)
      from  13f135c7a252cc46cff96e75968d92b6dc8dce1b (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 d2bc66f241a66cc95140cbb3a07555f6301290ed
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Jun 11 08:46:37 2018 +0200

    gpg: Set some list options with --show-keys
    
    * g10/gpg.c (main): Set some list options.
    --
    
    The new command --show-keys is commonly used to check the content of a
    file with keys.  In this case it can be expected that all included
    subkeys and uids are of interested, even when they are already expired
    or have been revoked.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/doc/gpg.texi b/doc/gpg.texi
index 9db2365..5f114c5 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -356,9 +356,11 @@ be used to locate a key.  Only public keys are listed.
 @item --show-keys
 @opindex show-keys
 This commands takes OpenPGP keys as input and prints information about
-them in the same way the command @option{--list-keys} does for
-imported key.  No internal state is changed.  For automated processing
-this command should be combined with the option
+them in the same way the command @option{--list-keys} does for locally
+stored key.  In addition the list options @code{show-unusable-uids},
+ at code{show-unusable-subkeys}, @code{show-notations} and
+ at code{show-policy-urls} are also enabled.  As usual for automated
+processing, this command should be combined with the option
 @option{--with-colons}.
 
 @item --fingerprint
diff --git a/g10/gpg.c b/g10/gpg.c
index 499c005..8effc53 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -2650,6 +2650,10 @@ main (int argc, char **argv)
             opt.import_options |= IMPORT_SHOW;
             opt.import_options |= IMPORT_DRY_RUN;
             opt.import_options &= ~IMPORT_REPAIR_KEYS;
+            opt.list_options |= LIST_SHOW_UNUSABLE_UIDS;
+            opt.list_options |= LIST_SHOW_UNUSABLE_SUBKEYS;
+            opt.list_options |= LIST_SHOW_NOTATIONS;
+            opt.list_options |= LIST_SHOW_POLICY_URLS;
             break;
 
 	  case aDetachedSign: detached_sig = 1; set_cmd( &cmd, aSign ); break;

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

Summary of changes:
 doc/gpg.texi | 8 +++++---
 g10/gpg.c    | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)


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