sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

report-error.bbclass: Support Unicode reports 

Currently error-report doesn't manage Unicode because
the files are opened with the default codec.

This patch changes the codec of the files to UTF-8,
this way the reports will include Unicode characters.
This is useful for the qemu output when doing the
testimage task.

[YOCTO #8225]

(From OE-Core rev: afb5308770de776181da5b44f9dc30922836bc38)

Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Mariano Lopez 2015-10-01 10:40:46 +00:00 committed by Richard Purdie
parent b25af33734
commit 1f9945266a
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/classes/report-error.bbclass
View File

@ -9,22 +9,25 @@
ERR_REPORT_DIR ?= "${LOG_DIR}/error-report"
def errorreport_getdata(e):
import codecs
logpath = e.data.getVar('ERR_REPORT_DIR', True)
datafile = os.path.join(logpath, "error-report.txt")
with open(datafile) as f:
with codecs.open(datafile, 'r', 'utf-8') as f:
data = f.read()
return data
def errorreport_savedata(e, newdata, file):
import json
import codecs
logpath = e.data.getVar('ERR_REPORT_DIR', True)
datafile = os.path.join(logpath, file)
with open(datafile, "w") as f:
with codecs.open(datafile, 'w', 'utf-8') as f:
json.dump(newdata, f, indent=4, sort_keys=True)
return datafile
python errorreport_handler () {
import json
import codecs
logpath = e.data.getVar('ERR_REPORT_DIR', True)
datafile = os.path.join(logpath, "error-report.txt")
@ -53,8 +56,8 @@ python errorreport_handler () {
taskdata['task'] = task
if log:
try:
logFile = open(log, 'r')
logdata = logFile.read().decode('utf-8')
logFile = codecs.open(log, 'r', 'utf-8')
logdata = logFile.read()
logFile.close()
except:
logdata = "Unable to read log file"