X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Debbugs%2FLog.pm;h=de639494f087788f11f48304fcdf271d494dab4e;hb=ab887f2c65e8ac828c6855f9904c81909256fc45;hp=2ae7af7b919705b1e859f55cfc686a0741ab980c;hpb=b5369abc094a0879c1b475b1a85e88debf2547ec;p=debbugs.git diff --git a/Debbugs/Log.pm b/Debbugs/Log.pm index 2ae7af7..de63949 100644 --- a/Debbugs/Log.pm +++ b/Debbugs/Log.pm @@ -390,8 +390,12 @@ sub write_log_records croak "record type '$type' with no text field" unless defined $record->{text}; # I am not sure if we really want to croak here; but this is # almost certainly a bug if is_utf8 is on. - # croak "probably wrong encoding" if is_utf8($record->{text}); - my ($text) = escape_log($record->{text}); + my $text = $record->{text}; + if (is_utf8($text)) { + carp('Record text was in the wrong encoding (perl internal instead of utf8 octets)'); + $text = encode_utf8($text) + } + ($text) = escape_log($text); if ($type eq 'autocheck') { print {$logfh} "\01\n$text\03\n" or die "Unable to write to logfile: $!";