[Pgp-tools-commit] r23 - trunk/caff

[Peter Palfrader]

Author: weasel
Date: 2004-10-20 05:16:28 -0600 (Wed, 20 Oct 2004)
New Revision: 23

Modified:
   trunk/caff/caff
Log:
More verbose debug output

Modified: trunk/caff/caff
===================================================================
--- trunk/caff/caff	2004-10-20 11:12:50 UTC (rev 22)
+++ trunk/caff/caff	2004-10-20 11:16:28 UTC (rev 23)
@@ -684,7 +684,8 @@
 		while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
 			# sig:?::17:EA2199412477CAF8:1058095214:::::13x:
 			my @sigline = grep { /^sig/ } (split /\n/, $stdout);
-			notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!?.") if scalar @sigline >= 2; # XXX
+			$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
@@ -702,7 +703,6 @@
 					$answer = "yes";
 				};
 			} else {
-				$stdout =~ s/\n/\\n/g;
 				debug("[sigremoval] no sig line here, only got: ".$stdout);
 			};
 			($stdout, $stderr, $status) =