[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4978/8267] bitbake: toaster: resolve missing 'native[sdk]:' prefixes

[Emmanuele Bassi <ebassi src gnome org>]

commit 35ce834167b186c748793a95cb3d900cc6660dc7
Author: David Reyna <David Reyna windriver com>
Date:   Mon Mar 6 14:05:07 2017 -0800

    bitbake: toaster: resolve missing 'native[sdk]:' prefixes
    
    Some task events are missing the 'virtual:native[sdk]:' prefixes.
    The Toaster has code to help match missing prefixes, but needs
    additional help resolving between 'native:' and 'nativesdk:', by
    way of the '_package' event field.
    
    [YOCTO #10849]
    
    (Bitbake rev: e455e40ba309837903b9e2d5f1dff55cce1135de)
    
    Signed-off-by: David Reyna <David Reyna windriver com>
    Signed-off-by: brian avery <brian avery intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/ui/buildinfohelper.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index 5ed150d..92d1a1c 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -1258,6 +1258,14 @@ class BuildInfoHelper(object):
                 candidates = [x for x in self.internal_state['taskdata'].keys() if x.endswith(identifier)]
                 if len(candidates) == 1:
                     identifier = candidates[0]
+                elif len(candidates) > 1 and hasattr(event,'_package'):
+                    if 'native-' in event._package:
+                        identifier = 'native:' + identifier
+                    if 'nativesdk-' in event._package:
+                        identifier = 'nativesdk:' + identifier
+                    candidates = [x for x in self.internal_state['taskdata'].keys() if 
x.endswith(identifier)]
+                    if len(candidates) == 1:
+                        identifier = candidates[0]
 
         assert identifier in self.internal_state['taskdata']
         identifierlist = identifier.split(":")