[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5253/8267] bitbake: taskdata.py: include more information in error message about broken task depends

[Emmanuele Bassi <ebassi src gnome org>]

commit 9b6b47c09d8ed6b014f6ea0b0ec285245283d8ab
Author: Patrick Ohly <patrick ohly intel com>
Date:   Fri Mar 17 10:20:23 2017 +0100

    bitbake: taskdata.py: include more information in error message about broken task depends
    
    This is what was reported when variable expansion in the 'depends'
    varflag of a task was broken:
    
       ERROR: Error for .../refkit-image-common.bb, dependency ${@ does not contain exactly one ':' character.
        Task 'depends' should be specified in the form 'packagename:task'
    
    It's not clear which task had this broken 'depends' and while one can
    guess that variable expansion failed, the full expression isn't
    printed either.
    
    This is more useful:
    
       ERROR: Error for .../refkit-image-common.bb:do_stage_swupd_inputs[depends], dependency ${@ in '      
virtual/fakeroot-native:do_populate_sysroot     ${@ ' 
'.join(['bundle-refkit-image-common-%s:do_swupd_list_bundle' % x for x in '${SWUPD_BUNDLES}'.split()]) } ' 
does not contain exactly one ':' character.
        Task 'depends' should be specified in the form 'packagename:task'
    
    The 'depends' part gets repeated intentionally, to ensure that it doesn't get overlooked.
    
    (Bitbake rev: eeeed7693710e4a78fec639b8050d8efe4ea3c33)
    
    Signed-off-by: Patrick Ohly <patrick ohly intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/taskdata.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/bb/taskdata.py b/bitbake/lib/bb/taskdata.py
index 1f3b24c..8c96a56 100644
--- a/bitbake/lib/bb/taskdata.py
+++ b/bitbake/lib/bb/taskdata.py
@@ -97,7 +97,7 @@ class TaskData:
                     if dep:
                         parts = dep.split(":")
                         if len(parts) != 2:
-                            bb.msg.fatal("TaskData", "Error for %s, dependency %s does not contain exactly 
one ':' character.\n Task '%s' should be specified in the form 'packagename:task'" % (fn, dep, dep_name))
+                            bb.msg.fatal("TaskData", "Error for %s:%s[%s], dependency %s in '%s' does not 
contain exactly one ':' character.\n Task '%s' should be specified in the form 'packagename:task'" % (fn, 
task, dep_name, dep, task_deps[dep_name][task], dep_name))
                         ids.append((parts[0], parts[1]))
                         seen(parts[0])
                 depends.extend(ids)