diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-07-12 10:23:18 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-20 10:24:51 +0100 |
| commit | 95794e261628f83ddab0aa7b8bafb6409cc9deb5 (patch) | |
| tree | b0e7748ab40bebdd17cc2f752bfeb430376c288b | |
| parent | 0cb5c06ea12c9070f19045cc82fc6276bfad3970 (diff) | |
| download | openembedded-core-95794e261628f83ddab0aa7b8bafb6409cc9deb5.tar.gz openembedded-core-95794e261628f83ddab0aa7b8bafb6409cc9deb5.tar.bz2 openembedded-core-95794e261628f83ddab0aa7b8bafb6409cc9deb5.zip | |
report-error: replace build paths with markers not whitespace
To remove potentially personal information and reduce irrelevant noise when
searching for similar reports the error reporting class removes ${TOPDIR} from
the logs. Whilst this is valid intention, the replacement of ' ' results in
potentially confusing logs as it appears that builds are happening in /tmp, or
whitespace can appear in places where it isn't allowed which can look like a
bug.
Solve both of these by replacing the value of TOPDIR with the literal string
TOPDIR.
Also replace TMPDIR after TOPDIR, as it's not uncommon to have TMPDIR somewhere
other than directly under TOPDIR.
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/report-error.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass index 5cbf8f07fd..c8c15bdafa 100644 --- a/meta/classes/report-error.bbclass +++ b/meta/classes/report-error.bbclass @@ -59,9 +59,11 @@ python errorreport_handler () { logFile = codecs.open(log, 'r', 'utf-8') logdata = logFile.read() - topdir = e.data.getVar('TOPDIR', True) - if topdir: - logdata = logdata.replace(topdir, ' ') + # 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: |