From c032066d6b6069b88f1a65f132594d5a1aa23647 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 25 Feb 2021 17:02:49 +0100 Subject: [PATCH] kbx: Log debug fixes -- --- kbx/kbx-client-util.c | 6 ++++-- tools/gpg-card.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c index f7477661f..bd71cf2ba 100644 --- a/kbx/kbx-client-util.c +++ b/kbx/kbx-client-util.c @@ -375,7 +375,8 @@ kbx_client_data_cmd (kbx_client_data_t kcd, const char *command, status_cb, status_cb_value); if (err) { - if (gpg_err_code (err) != GPG_ERR_NOT_FOUND) + if (gpg_err_code (err) != GPG_ERR_NOT_FOUND + && gpg_err_code (err) != GPG_ERR_NOTHING_FOUND) log_debug ("%s: finished command with error: %s\n", __func__, gpg_strerror (err)); /* Fixme: On unexpected errors we need a way to cancel the @@ -397,7 +398,8 @@ kbx_client_data_cmd (kbx_client_data_t kcd, const char *command, status_cb, status_cb_value); if (err) { - if (gpg_err_code (err) != GPG_ERR_NOT_FOUND) + if (gpg_err_code (err) != GPG_ERR_NOT_FOUND + && gpg_err_code (err) != GPG_ERR_NOTHING_FOUND) log_debug ("%s: finished command with error: %s\n", __func__, gpg_strerror (err)); xfree (get_membuf (&mb, &len)); diff --git a/tools/gpg-card.c b/tools/gpg-card.c index fb12353f4..c702f71a2 100644 --- a/tools/gpg-card.c +++ b/tools/gpg-card.c @@ -720,7 +720,7 @@ list_one_kinfo (card_info_t info, key_info_t kinfo, if (err) { if (gpg_err_code (err) != GPG_ERR_NO_PUBKEY) - tty_fprintf (fp, " error ......: %s\n", gpg_strerror (err)); + tty_fprintf (fp, " used for ...: [%s]\n", gpg_strerror (err)); goto leave; } for (kb = keyblock; kb; kb = kb->next)