| Message ID | 1492181919-10631-1-git-send-email-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | fbeb33752999e7317113199ef89873d6b6916814 |
| Delegated to: | Tom Rini |
| Headers | show |
On 14 April 2017 at 08:58, Tom Rini <trini@konsulko.com> wrote: > When writing out some of our results we may now have UTF-8 characters > in there as well. Translate these to latin-1 and ignore any errors (as > this is for diagnostic and given the githash anything else can be > reconstructed by the user. > > Cc: Simon Glass <sjg@chromium.org> > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > tools/buildman/builderthread.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
On Fri, Apr 14, 2017 at 10:19:36AM -0600, Simon Glass wrote: > On 14 April 2017 at 08:58, Tom Rini <trini@konsulko.com> wrote: > > When writing out some of our results we may now have UTF-8 characters > > in there as well. Translate these to latin-1 and ignore any errors (as > > this is for diagnostic and given the githash anything else can be > > reconstructed by the user. > > > > Cc: Simon Glass <sjg@chromium.org> > > Signed-off-by: Tom Rini <trini@konsulko.com> > > --- > > tools/buildman/builderthread.py | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot/master, thanks!
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index f2b2acd1eba9..acaf5007f50c 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -280,13 +280,13 @@ class BuilderThread(threading.Thread): outfile = os.path.join(build_dir, 'log') with open(outfile, 'w') as fd: if result.stdout: - fd.write(result.stdout) + fd.write(result.stdout.encode('latin-1', 'ignore')) errfile = self.builder.GetErrFile(result.commit_upto, result.brd.target) if result.stderr: with open(errfile, 'w') as fd: - fd.write(result.stderr) + fd.write(result.stderr.encode('latin-1', 'ignore')) elif os.path.exists(errfile): os.remove(errfile)
When writing out some of our results we may now have UTF-8 characters in there as well. Translate these to latin-1 and ignore any errors (as this is for diagnostic and given the githash anything else can be reconstructed by the user. Cc: Simon Glass <sjg@chromium.org> Signed-off-by: Tom Rini <trini@konsulko.com> --- tools/buildman/builderthread.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)