diff options
| author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
| commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
| tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /g10/keygen.c | |
| parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
| parent | po: Remove trailing colon from a German pinentry string. (diff) | |
| download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'g10/keygen.c')
| -rw-r--r-- | g10/keygen.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 048a391c3..e959ee901 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -3529,7 +3529,14 @@ proc_parameter_file (ctrl_t ctrl, struct para_data_s *para, const char *fname, if( s2 ) p = stpcpy(stpcpy(stpcpy(p," ("), s2 ),")"); if( s3 ) - p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">"); + { + /* If we have only the email part, do not add the space + * and the angle brackets. */ + if (*r->u.value) + p = stpcpy(stpcpy(stpcpy(p," <"), s3 ),">"); + else + p = stpcpy (p, s3); + } append_to_parameter (para, r); have_user_id=1; } |