[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2497/8267] bitbake: cooker: check if target contains task



commit 5414b80e8df11188d8e67a37185305c34ea084bd
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Thu Sep 15 11:26:28 2016 +0300

    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>

 bitbake/lib/bb/cooker.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 0e78106..cc8891f 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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]