diff options
| author | Werner Koch <[email protected]> | 2017-08-04 15:03:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-08-04 15:03:03 +0000 |
| commit | d9fabcc1989d7235ea0294874803295a30f8711b (patch) | |
| tree | 4f4fc5dcc5ead6cdaa8f03c809eeff51346ad9b8 | |
| parent | wks: Allow gpg-wks-client --supported with just the domain name (diff) | |
| download | gnupg-d9fabcc1989d7235ea0294874803295a30f8711b.tar.gz gnupg-d9fabcc1989d7235ea0294874803295a30f8711b.zip | |
gpg: New import option show-only.
* g10/options.h (IMPORT_DRY_RUN): New.
* g10/import.c (parse_import_options): Add "show-only".
(import_one): use that as alternative to opt.dry_run.
--
This is just a convenience thing for
--import-options import-show --dry-run
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | doc/gpg.texi | 4 | ||||
| -rw-r--r-- | g10/import.c | 6 | ||||
| -rw-r--r-- | g10/options.h | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi index 1984445ad..01dfeb770 100644 --- a/doc/gpg.texi +++ b/doc/gpg.texi @@ -2302,9 +2302,11 @@ opposite meaning. The options are: keyserver @option{--receive-keys}. @item import-show + @itemx show-only Show a listing of the key as imported right before it is stored. This can be combined with the option @option{--dry-run} to only look - at keys. + at keys; the option @option{show-only} is a shortcut for this + combination. @item import-export Run the entire import code but instead of storing the key to the diff --git a/g10/import.c b/g10/import.c index 813662537..b1b8e0f9e 100644 --- a/g10/import.c +++ b/g10/import.c @@ -190,6 +190,10 @@ parse_import_options(char *str,unsigned int *options,int noisy) {"repair-keys", IMPORT_REPAIR_KEYS, NULL, N_("repair keys on import")}, + /* No description to avoid string change: Fixme for 2.3 */ + {"show-only", (IMPORT_SHOW | IMPORT_DRY_RUN), NULL, + NULL}, + /* Aliases for backward compatibility */ {"allow-local-sigs",IMPORT_LOCAL_SIGS,NULL,NULL}, {"repair-hkp-subkey-bug",IMPORT_REPAIR_PKS_SUBKEY_BUG,NULL,NULL}, @@ -1790,7 +1794,7 @@ import_one (ctrl_t ctrl, goto leave; } - if (opt.dry_run) + if (opt.dry_run || (options & IMPORT_DRY_RUN)) goto leave; /* Do we have this key already in one of our pubrings ? */ diff --git a/g10/options.h b/g10/options.h index 83f402853..8431f7525 100644 --- a/g10/options.h +++ b/g10/options.h @@ -352,6 +352,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode; #define IMPORT_EXPORT (1<<9) #define IMPORT_RESTORE (1<<10) #define IMPORT_REPAIR_KEYS (1<<11) +#define IMPORT_DRY_RUN (1<<12) #define EXPORT_LOCAL_SIGS (1<<0) #define EXPORT_ATTRIBUTES (1<<1) |