diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/classes/report-error.bbclass')
| -rw-r--r-- | import-layers/yocto-poky/meta/classes/report-error.bbclass | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/import-layers/yocto-poky/meta/classes/report-error.bbclass b/import-layers/yocto-poky/meta/classes/report-error.bbclass index 82b5bcd69..5bb231efc 100644 --- a/import-layers/yocto-poky/meta/classes/report-error.bbclass +++ b/import-layers/yocto-poky/meta/classes/report-error.bbclass @@ -42,8 +42,8 @@ python errorreport_handler () { data['distro'] = e.data.getVar("DISTRO", True) data['target_sys'] = e.data.getVar("TARGET_SYS", True) data['failures'] = [] - data['component'] = e.getPkgs()[0] - data['branch_commit'] = base_detect_branch(e.data) + ": " + base_detect_revision(e.data) + data['component'] = " ".join(e.getPkgs()) + data['branch_commit'] = str(base_detect_branch(e.data)) + ": " + str(base_detect_revision(e.data)) lock = bb.utils.lockfile(datafile + '.lock') errorreport_savedata(e, data, "error-report.txt") bb.utils.unlockfile(lock) @@ -58,6 +58,13 @@ python errorreport_handler () { try: logFile = codecs.open(log, 'r', 'utf-8') logdata = logFile.read() + + # Replace host-specific paths so the logs are cleaner + for d in ("TOPDIR", "TMPDIR"): + s = e.data.getVar(d, True) + if s: + logdata = logdata.replace(s, d) + logFile.close() except: logdata = "Unable to read log file" |
