From 68c8619114fd5f24cb6bfb9e0f25c428a8805323 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 19 Oct 2017 17:05:39 +0200 Subject: [PATCH] gpg: Make --dry-run and show-only work for secret keys. * g10/import.c (import_secret_one): Check for dry-run before transferring keys. -- The use of --dry-run or --import-option show-only had no effect when importing a secret key and the public key already existed. If the public key did not exist an error message inhibited the import of the secret key. Signed-off-by: Werner Koch --- g10/import.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/g10/import.c b/g10/import.c index 8dd6b501e..255e48fb2 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2532,7 +2532,8 @@ import_secret_one (ctrl_t ctrl, kbnode_t keyblock, /* At least we cancel the secret key import when the public key import was skipped due to MERGE_ONLY option and a new key. */ - if (stats->skipped_new_keys <= nr_prev) + if (!(opt.dry_run || (options & IMPORT_DRY_RUN)) + && stats->skipped_new_keys <= nr_prev) { /* Read the keyblock again to get the effects of a merge. */ /* Fixme: we should do this based on the fingerprint or