[oe-commits] [bitbake] branch master updated: toaster: resolve missing 'native[sdk]:' prefixes

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository bitbake.

The following commit(s) were added to refs/heads/master by this push:
     new e455e40  toaster: resolve missing 'native[sdk]:' prefixes
e455e40 is described below

commit e455e40ba309837903b9e2d5f1dff55cce1135de
Author: David Reyna <David.Reyna at windriver.com>
AuthorDate: Mon Mar 6 14:05:07 2017 -0800

    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]
    
    Signed-off-by: David Reyna <David.Reyna at windriver.com>
    Signed-off-by: brian avery <brian.avery at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/ui/buildinfohelper.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 5ed150d..92d1a1c 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/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(":")

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