[Pkg-gnupg-commit] [gnupg2] 137/205: gpg: Avoid debug like output at start of --edit-key.
Daniel Kahn Gillmor
dkg at fifthhorseman.net
Wed May 11 08:38:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
dkg pushed a commit to branch experimental
in repository gnupg2.
commit 085b19fc9aa7f2f9b82a97824b117e71390964ec
Author: Werner Koch <wk at gnupg.org>
Date: Tue Apr 19 17:45:27 2016 +0200
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 <wk at gnupg.org>
---
g10/keyedit.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/g10/keyedit.c b/g10/keyedit.c
index e138efa..cd89325 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)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git
More information about the Pkg-gnupg-commit
mailing list