More verbose debug output

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 6b23803ece8e024a0141f62793aed9e4ea2eac14..73aacd55e37ea27e2297f4ad89cf5ca2a711605d 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -684,18 +684,26 @@ for my $keyid (@keyids_ok) {
                while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
                        # sig:?::17:EA2199412477CAF8:1058095214:::::13x:
                        my @sigline = grep { /^sig/ } (split /\n/, $stdout);
+                       $stdout =~ s/\n/\\n/g;
+                       notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!? got: $stdout") if scalar @sigline >= 2; # XXX
                        my $line = pop @sigline;
                        my $answer = "no";
                        if (defined $line) { # only if we found a sig here - we never remove revocation packets for instance
+                               debug("[sigremoval] doing line $line.");
                                my ($dummy1, $dummy2, $dummy3, $dummy4, $signer, $created, $dummy7, $dummy8, $dummy9) = split /:/, $line;
                                if ($signer eq $longkeyid) {
+                                       debug("[sigremoval] selfsig ($signer).");
                                        $answer = "no";
                                } elsif (grep { $signer eq $_ } @{$CONFIG{'keyid'}}) {
+                                       debug("[sigremoval] signed by us ($signer).");
                                        $answer = "no";
                                        $signed_by_me = $signed_by_me > $created ? $signed_by_me : $created;
                                } else {
+                                       debug("[sigremoval] not interested in that sig ($signer).");
                                        $answer = "yes";
                                };
+                       } else {
+                               debug("[sigremoval] no sig line here, only got: ".$stdout);
                        };
                        ($stdout, $stderr, $status) =
                                readwrite_gpg($answer."\n", $inputfd, $stdoutfd, $stderrfd, $statusfd, exitwhenstatusmatches => $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT, nocloseinput => 1);