aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2016-04-19 15:45:27 +0000
committerWerner Koch <[email protected]>2016-04-19 15:57:21 +0000
commit085b19fc9aa7f2f9b82a97824b117e71390964ec (patch)
tree77fe0f3f5659561b1d5a4e17573f40bea093a1da
parentdirmngr: Fix https never reported in general help (diff)
downloadgnupg-085b19fc9aa7f2f9b82a97824b117e71390964ec.tar.gz
gnupg-085b19fc9aa7f2f9b82a97824b117e71390964ec.zip
gpg: Avoid debug like output at start of --edit-key.
* g10/keyedit.c (check_all_keysigs): Print info only after something has been modified. -- Signed-off-by: Werner Koch <[email protected]>
-rw-r--r--g10/keyedit.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index e138efa7c..cd8932519 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -752,7 +752,9 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
else
last_printed_component = current_component;
- if (last_printed_component->pkt->pkttype == PKT_USER_ID)
+ if (!modified)
+ ;
+ else if (last_printed_component->pkt->pkttype == PKT_USER_ID)
{
tty_printf ("uid ");
tty_print_utf8_string (last_printed_component
@@ -770,13 +772,17 @@ check_all_keysigs (KBNODE kb, int only_selected, int only_selfsigs)
pk_keyid_str (last_printed_component
->pkt->pkt.public_key));
- if (is_reordered)
- tty_printf (_(" (reordered signatures follow)"));
- tty_printf ("\n");
+ if (modified)
+ {
+ if (is_reordered)
+ tty_printf (_(" (reordered signatures follow)"));
+ tty_printf ("\n");
+ }
}
- print_one_sig (rc, kb, n, NULL, NULL, NULL, has_selfsig,
- 0, only_selfsigs);
+ if (modified)
+ print_one_sig (rc, kb, n, NULL, NULL, NULL, has_selfsig,
+ 0, only_selfsigs);
}
if (dump_sig_params)