[PATCH] cooker: Fix incorrect dot file generation

[PATCH] cooker: Fix incorrect dot file generation

[Richard Purdie]

In the runqueue cleanup/conversion, "dep" was mistakenly used where "tid" should
be leading to incorrect task-depends.dot files and causing general confusion. 
Fix this, its clearly incorrect looking at the code.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 9bd3460..a73a55d 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -744,7 +744,7 @@ class BBCooker:
             for dep in rq.rqdata.runtaskentries[tid].depends:
                 depfn = bb.runqueue.fn_from_tid(dep)
                 deppn = self.recipecache.pkg_fn[depfn]
-                dotname = "%s.%s" % (pn, bb.runqueue.taskname_from_tid(dep))
+                dotname = "%s.%s" % (pn, bb.runqueue.taskname_from_tid(tid))
                 if not dotname in depend_tree["tdepends"]:
                     depend_tree["tdepends"][dotname] = []
                 depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep)))

Re: [PATCH] cooker: Fix incorrect dot file generation

[Patrick Ohly]

On Wed, 2016-07-20 at 16:08 +0100, Richard Purdie wrote:
> In the runqueue cleanup/conversion, "dep" was mistakenly used where "tid" should
> be leading to incorrect task-depends.dot files and causing general confusion. 
> Fix this, its clearly incorrect looking at the code.
> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> 
> diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
> index 9bd3460..a73a55d 100644
> --- a/bitbake/lib/bb/cooker.py
> +++ b/bitbake/lib/bb/cooker.py
> @@ -744,7 +744,7 @@ class BBCooker:
>              for dep in rq.rqdata.runtaskentries[tid].depends:
>                  depfn = bb.runqueue.fn_from_tid(dep)
>                  deppn = self.recipecache.pkg_fn[depfn]
> -                dotname = "%s.%s" % (pn, bb.runqueue.taskname_from_tid(dep))
> +                dotname = "%s.%s" % (pn, bb.runqueue.taskname_from_tid(tid))
>                  if not dotname in depend_tree["tdepends"]:
>                      depend_tree["tdepends"][dotname] = []
>                  depend_tree["tdepends"][dotname].append("%s.%s" % (deppn, bb.runqueue.taskname_from_tid(dep)))

+1, this is indeed fixing the issue I was seeing. Thanks!

-- 
Best Regards, Patrick Ohly

The content of this message is my personal opinion only and although
I am an employee of Intel, the statements I make here in no way
represent Intel's position on the issue, nor am I authorized to speak
on behalf of Intel on this matter.