diff options
| author | Werner Koch <[email protected]> | 2018-06-06 09:50:58 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-06-06 09:59:06 +0000 |
| commit | dc87a3341f28ddac1113e90a3861d062be2610e2 (patch) | |
| tree | f82f4239fe8cf452ad8a0823da9fa76739183213 /g10/import.c | |
| parent | po: Fix Swedish and Turkish translations. (diff) | |
| download | gnupg-dc87a3341f28ddac1113e90a3861d062be2610e2.tar.gz gnupg-dc87a3341f28ddac1113e90a3861d062be2610e2.zip | |
gpg: New command --show-keys.
* g10/gpg.c (aShowKeys): New const.
(opts): New command --show-keys.
(main): Implement command.
* g10/import.c (import_keys_internal): Don't print stats in show-only
mode.
(import_one): Be silent in show-only mode.
--
Using
--import --import-options show-only
to look at a key is too cumbersome. Provide this shortcut and also
remove some diagnostic cruft in this case.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 257661d6ae0ca376df758c38fabab2316d10e3a9)
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index c07f67fe2..10fbd4281 100644 --- a/g10/import.c +++ b/g10/import.c @@ -494,7 +494,9 @@ import_keys_internal (ctrl_t ctrl, iobuf_t inp, char **fnames, int nnames, if (!stats_handle) { - import_print_stats (stats); + if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN)) + != (IMPORT_SHOW | IMPORT_DRY_RUN)) + import_print_stats (stats); import_release_stats_handle (stats); } @@ -1635,6 +1637,10 @@ import_one (ctrl_t ctrl, int any_filter = 0; KEYDB_HANDLE hd = NULL; + /* If show-only is active we don't won't any extra output. */ + if ((options & (IMPORT_SHOW | IMPORT_DRY_RUN))) + silent = 1; + /* Get the key and print some info about it. */ node = find_kbnode( keyblock, PKT_PUBLIC_KEY ); if (!node ) |