[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.9-18-ga9931b3

[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  a9931b3c052ee9025705a8ef1f0cdd5f20aeda70 (commit)
      from  2d700f2c6c1831d8a113b6cf4b8ca81db363b09a (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 a9931b3c052ee9025705a8ef1f0cdd5f20aeda70
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Aug 29 15:14:29 2018 +0200

    gpg: Explain error message in key generation with --batch
    
    * g10/keygen.c (generate_keypair): Show more info.
    --
    
    GnuPG-bug-id: 3912
    Signed-off-by: Werner Koch <wk at gnupg.org>
    (cherry picked from commit 1bfe766bcf3959135333900934f1a15c9b96c3cf)

diff --git a/g10/keygen.c b/g10/keygen.c
index a4949f4..ed57d5d 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4135,8 +4135,10 @@ generate_keypair (ctrl_t ctrl, int full, const char *fname,
 
   if (opt.batch && card_serialno)
     {
-      /* We don't yet support unattended key generation. */
+      /* We don't yet support unattended key generation with a card
+       * serial number. */
       log_error (_("can't do this in batch mode\n"));
+      print_further_info ("key generation with card serial number");
       return;
     }
 

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

Summary of changes:
 g10/keygen.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


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