From a92ef13e3dc417c0dbb0543eccb3ed2223d02b92 Mon Sep 17 00:00:00 2001 From: Ola x Nilsson Date: Mon, 21 Oct 2019 12:30:31 +0200 Subject: report-error.bbclass: Use with to control file handle lifetime (From OE-Core rev: ab108dfc690fb95b66f1c6243ff165f0849fa2b1) Signed-off-by: Ola x Nilsson Signed-off-by: Richard Purdie --- meta/classes/report-error.bbclass | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index ea043b23e1..1a12db1206 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -78,19 +78,15 @@ python errorreport_handler () { taskdata['task'] = task if log: try: - logFile = codecs.open(log, 'r', 'utf-8') - logdata = logFile.read() - + with codecs.open(log, encoding='utf-8') as logFile: + logdata = logFile.read() # Replace host-specific paths so the logs are cleaner for d in ("TOPDIR", "TMPDIR"): s = e.data.getVar(d) if s: logdata = logdata.replace(s, d) - - logFile.close() except: logdata = "Unable to read log file" - else: logdata = "No Log" -- cgit v1.2.3-54-g00ecf