diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/import.c | 6 | ||||
| -rw-r--r-- | g10/options.h | 1 |
2 files changed, 6 insertions, 1 deletions
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) |