From: Ed Bartosh <ed.bartosh@linux.intel.com>
Date: Thu, 15 Sep 2016 08:26:28 +0000 (+0300)
Subject: bitbake: cooker: check if target contains task
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5414b80e8df11188d8e67a37185305c34ea084bd;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bitbake: 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]

(Bitbake rev: b7faf1af3bd3110fba347fbe6e432fc4ee66590a)

Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 0e78106d291..cc8891f48b4 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/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)