[Pkg-gnupg-commit] [gnupg2] 13/49: gpg: Print sec/sbb with --import-option import-show or show-only.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 2c7dccca9b617780a3ea760adf460bb3b77f90f3
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 19 17:12:36 2017 +0200

    gpg: Print sec/sbb with --import-option import-show or show-only.
    
    * g10/import.c (import_one): Pass FROM_SK to list_keyblock_direct.
    --
    
    Note that this will likely add the suffix '#' top "sec" because the
    secret key has not yet (or will not be) imported.  If the secret key
    already exists locally another suffix might be printed.  The upshot is
    that the suffix has no usefulness.
    
    GnuPG-bug-id: 3431
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 doc/gpg.texi | 3 ++-
 g10/import.c | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/gpg.texi b/doc/gpg.texi
index b14cb37..bd45b04 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 255e48f..71e3955 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);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git