aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/gpg.texi3
-rw-r--r--g10/import.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/doc/gpg.texi b/doc/gpg.texi
index b14cb371b..bd45b0422 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -2306,7 +2306,8 @@ opposite meaning. The options are:
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; the option @option{show-only} is a shortcut for this
- combination.
+ combination. Note that suffixes like '#' for "sec" and "sbb" lines
+ may or may not be printed.
@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 255e48fb2..71e39557c 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1778,7 +1778,7 @@ import_one (ctrl_t ctrl,
merge_keys_done = 1;
/* Note that we do not want to show the validity because the key
* has not yet imported. */
- list_keyblock_direct (ctrl, keyblock, 0, 0,
+ list_keyblock_direct (ctrl, keyblock, from_sk, 0,
opt.fingerprint || opt.with_fingerprint, 1);
es_fflush (es_stdout);
}