[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7275/8267] report-error: provide distro identifier string in case of uninative build

[Emmanuele Bassi <ebassi src gnome org>]

commit 0c733631d69973d24a950cbd5098d326572ce988
Author: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
Date:   Thu Aug 17 11:00:36 2017 -0700

    report-error: provide distro identifier string in case of uninative build
    
    Besides providing the NATIVELSBSTRING, include distro info when creating
    the (json) error report. This information provides better info than the
    standard 'universal*' string for uninative builds.
    
    [YOCTO #11824]
    
    (From OE-Core rev: fdfbfc954a3e0ad79dc2bed9828f9f5dc40d506f)
    
    Signed-off-by: Leonardo Sandoval <leonardo sandoval gonzalez linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/report-error.bbclass |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/meta/classes/report-error.bbclass b/meta/classes/report-error.bbclass
index d6fdd36..1c55abf 100644
--- a/meta/classes/report-error.bbclass
+++ b/meta/classes/report-error.bbclass
@@ -29,6 +29,13 @@ python errorreport_handler () {
         import json
         import codecs
 
+        def nativelsb():
+            nativelsbstr = e.data.getVar("NATIVELSBSTRING")
+            # provide a bit more host info in case of uninative build
+            if e.data.getVar('UNINATIVE_URL') != 'unset':
+                return '/'.join([nativelsbstr, lsb_distro_identifier(e.data)])
+            return nativelsbstr
+
         logpath = e.data.getVar('ERR_REPORT_DIR')
         datafile = os.path.join(logpath, "error-report.txt")
 
@@ -38,7 +45,7 @@ python errorreport_handler () {
             machine = e.data.getVar("MACHINE")
             data['machine'] = machine
             data['build_sys'] = e.data.getVar("BUILD_SYS")
-            data['nativelsb'] = e.data.getVar("NATIVELSBSTRING")
+            data['nativelsb'] = nativelsb()
             data['distro'] = e.data.getVar("DISTRO")
             data['target_sys'] = e.data.getVar("TARGET_SYS")
             data['failures'] = []