|
@@ -280,13 +280,15 @@ class BuilderThread(threading.Thread):
|
|
outfile = os.path.join(build_dir, 'log')
|
|
outfile = os.path.join(build_dir, 'log')
|
|
with open(outfile, 'w') as fd:
|
|
with open(outfile, 'w') as fd:
|
|
if result.stdout:
|
|
if result.stdout:
|
|
- fd.write(result.stdout.encode('latin-1', 'ignore'))
|
|
|
|
|
|
+ # We don't want unicode characters in log files
|
|
|
|
+ fd.write(result.stdout.decode('UTF-8').encode('ASCII', 'replace'))
|
|
|
|
|
|
errfile = self.builder.GetErrFile(result.commit_upto,
|
|
errfile = self.builder.GetErrFile(result.commit_upto,
|
|
result.brd.target)
|
|
result.brd.target)
|
|
if result.stderr:
|
|
if result.stderr:
|
|
with open(errfile, 'w') as fd:
|
|
with open(errfile, 'w') as fd:
|
|
- fd.write(result.stderr.encode('latin-1', 'ignore'))
|
|
|
|
|
|
+ # We don't want unicode characters in log files
|
|
|
|
+ fd.write(result.stderr.decode('UTF-8').encode('ASCII', 'replace'))
|
|
elif os.path.exists(errfile):
|
|
elif os.path.exists(errfile):
|
|
os.remove(errfile)
|
|
os.remove(errfile)
|
|
|
|
|