[oe-commits] [bitbake] 03/03: cooker: check if target contains task

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository bitbake.

commit b7faf1af3bd3110fba347fbe6e432fc4ee66590a
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Thu Sep 15 11:26:28 2016 +0300

    cooker: check if target contains task
    
    Task name was incorrectly added to the targets that already
    contained :task suffix and fired with BuildInit event. This
    caused Toaster to create incorrect Target objects and show
    them in UI.
    
    [YOCTO #10221]
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cooker.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 0e78106..cc8891f 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -1421,7 +1421,8 @@ class BBCooker:
         if not task.startswith("do_"):
             task = "do_%s" % task
 
-        packages = ["%s:%s" % (target, task) for target in targets]
+        packages = [target if ':' in target else '%s:%s' % (target, task) for target in targets]
+
         bb.event.fire(bb.event.BuildInit(packages), self.expanded_data)
 
         taskdata, runlist = self.buildTaskData(targets, task, self.configuration.abort)

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