aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/import.c3
1 files changed, 2 insertions, 1 deletions
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