aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-15 11:26:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-16 15:19:33 +0100
commitb7faf1af3bd3110fba347fbe6e432fc4ee66590a (patch)
tree5a3d4aca89405a65b955048eaba9182a6103fc71 /lib
parent07a03a1290fd206df2b40ffc28381b5b3c10ba4a (diff)
downloadbitbake-b7faf1af3bd3110fba347fbe6e432fc4ee66590a.tar.gz
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@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/bb/cooker.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index 0e78106d2..cc8891f48 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)