X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=4eb9083a4ad564eb45c2196922ec8ef36692dac4;hb=35bdfd742c28b3c33c2456400df93fb1c12d2f03;hp=71a9dda1c33e3159a34554acc9074a4bb462e698;hpb=dd2dd6fabb7b0ab3b0ee5096ea1ab907c1c79574;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 71a9dda..4eb9083 100755
--- a/caff/caff
+++ b/caff/caff
@@ -200,7 +200,7 @@ sub info($) {
 };
 sub debug($) {
 	my ($line) = @_;
-	print "[DEBUG] $line\n";
+	#print "[DEBUG] $line\n";
 };
 sub trace($) {
 	my ($line) = @_;
@@ -247,7 +247,7 @@ sub readwrite_gpg($$$$$%) {
 
 	my ($stdout, $stderr, $status) = ("", "", "");
 	my $exitwhenstatusmatches = $options{'exitwhenstatusmatches'};
-	trace("doign stuff until we find $exitwhenstatusmatches") if defined $exitwhenstatusmatches;
+	trace("doing stuff until we find $exitwhenstatusmatches") if defined $exitwhenstatusmatches;
 
 	my $readwrote_stuff_this_time = 0;
 	my $do_not_wait_on_select = 0;
@@ -463,7 +463,7 @@ $CONFIG{'owner'}
 
 	$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
 	$message_entity->head->add("To", $address);
-	$message_entity->head->add("From", $CONFIG{'owner'}.' <'.$CONFIG{'email'}.'>');
+	$message_entity->head->add("From", '"'.$CONFIG{'owner'}.'" <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("User-Agent", $USER_AGENT);
 	$message_entity->send();
 	$message_entity->stringify();
@@ -596,7 +596,7 @@ for my $keyid (@keyids_ok) {
 	while (1) {
 		my $this_uid_text = '';
 		$uid_number++;
-		info("Doing key $keyid, uid $uid_number");
+		debug("Doing key $keyid, uid $uid_number");
 
 		# import into temporary gpghome
 		###############################
@@ -665,7 +665,7 @@ for my $keyid (@keyids_ok) {
 			next;
 		};
 		unless ($have_one) {
-			info("Uid ".($uid_number-1)." was the last, there is no $uid_number.");
+			debug("Uid ".($uid_number-1)." was the last, there is no $uid_number.");
 			info("key $keyid done.");
 			last;
 		};