[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.1-13-g2c7dccc

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  2c7dccca9b617780a3ea760adf460bb3b77f90f3 (commit)
       via  68c8619114fd5f24cb6bfb9e0f25c428a8805323 (commit)
      from  1ba308aa0356a57c21c4c8c2dac75b4d62b8aac3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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);
     }

commit 68c8619114fd5f24cb6bfb9e0f25c428a8805323
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Oct 19 17:05:39 2017 +0200

    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 <wk at gnupg.org>

diff --git a/g10/import.c b/g10/import.c
index 8dd6b50..255e48f 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

-----------------------------------------------------------------------

Summary of changes:
 doc/gpg.texi | 3 ++-
 g10/import.c | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org