Handle byte sequences which are not encoded as UTF8 while logging. (#21447)
Fix builds which produce a lines with non-UTF8 output while logging The alternative is to read in binary mode, and then decode while ignoring errors.
This commit is contained in:
parent
8f98f1d182
commit
9d4291e590
@ -780,7 +780,12 @@ def _writer_daemon(stdin_multiprocess_fd, read_multiprocess_fd, write_fd, echo,
|
|||||||
try:
|
try:
|
||||||
while line_count < 100:
|
while line_count < 100:
|
||||||
# Handle output from the calling process.
|
# Handle output from the calling process.
|
||||||
|
try:
|
||||||
line = _retry(in_pipe.readline)()
|
line = _retry(in_pipe.readline)()
|
||||||
|
except UnicodeDecodeError:
|
||||||
|
# installs like --test=root gpgme produce non-UTF8 logs
|
||||||
|
line = '<line lost: output was not encoded as UTF-8>\n'
|
||||||
|
|
||||||
if not line:
|
if not line:
|
||||||
return
|
return
|
||||||
line_count += 1
|
line_count += 1
|
||||||
|
Loading…
Reference in New Issue
Block a user