[oe-commits] [openembedded-core] 48/122: report-error: replace build paths with markers not whitespace

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 4dc05722472c2f98aa6d21a13fbaa2a9fcfb1b72
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Tue Jul 12 10:23:18 2016 +0100

    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 at intel.com>
---
 meta/classes/report-error.bbclass | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
index 5cbf8f0..c8c15bd 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:

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.