diff options
| author | Werner Koch <[email protected]> | 2019-07-04 13:21:39 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2019-07-04 13:22:00 +0000 |
| commit | 4cbd058a3da9aae74aadab7f260952b9ebb5becf (patch) | |
| tree | 51046665982c5fc504485c2d8e735f628785e080 | |
| parent | gpg: New command --locate-external-key. (diff) | |
| download | gnupg-4cbd058a3da9aae74aadab7f260952b9ebb5becf.tar.gz gnupg-4cbd058a3da9aae74aadab7f260952b9ebb5becf.zip | |
gpg: Avoid printing false AKL error message.
* g10/getkey.c (get_pubkey_byname): Add special traeatment for default
and skipped-local.
--
This change avoids error message like
gpg: error retrieving '[email protected]' via None: No public key
A 'None' mechanism is something internal.
Signed-off-by: Werner Koch <[email protected]>
(cherry picked from commit 91a6ba32347a21c9029728eec96b8ff80f944629)
Diffstat (limited to '')
| -rw-r--r-- | g10/getkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index f7f7a726f..08ad97255 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -1122,14 +1122,14 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, { case AKL_NODEFAULT: /* This is a dummy mechanism. */ - mechanism_string = "None"; + mechanism_string = ""; rc = GPG_ERR_NO_PUBKEY; break; case AKL_LOCAL: if (mode == GET_PUBKEY_NO_LOCAL) { - mechanism_string = "None"; + mechanism_string = ""; rc = GPG_ERR_NO_PUBKEY; } else @@ -1272,8 +1272,8 @@ get_pubkey_byname (ctrl_t ctrl, enum get_pubkey_modes mode, name, mechanism_string); break; } - if (gpg_err_code (rc) != GPG_ERR_NO_PUBKEY - || opt.verbose || no_fingerprint) + if ((gpg_err_code (rc) != GPG_ERR_NO_PUBKEY + || opt.verbose || no_fingerprint) && *mechanism_string) log_info (_("error retrieving '%s' via %s: %s\n"), name, mechanism_string, no_fingerprint ? _("No fingerprint") : gpg_strerror (rc)); |