diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/import.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/import.c b/g10/import.c index 6e33ac976..1ee818d61 100644 --- a/g10/import.c +++ b/g10/import.c @@ -2234,7 +2234,7 @@ import_one_real (ctrl_t ctrl, log_error (_("key %s: public key not found: %s\n"), keystr(keyid), gpg_strerror (err)); } - else if (err && (opt.import_options&IMPORT_MERGE_ONLY) ) + else if (err && ((opt.import_options|options)&IMPORT_MERGE_ONLY) ) { if (opt.verbose && !silent ) log_info( _("key %s: new key - skipped\n"), keystr(keyid)); |