Patchwork [bitbake-devel,1/1] siggen.py: Use basehash if no taskhash

login
register
mail settings
Submitter Robert Yang
Date March 6, 2012, 6:04 a.m.
Message ID <799f88e78f46b5a7eab5932060b4c2bf27ee1a95.1331012089.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/22731/
State New
Headers show

Comments

Robert Yang - March 6, 2012, 6:04 a.m.
The bitbake-runtask doesn't work since there is no taskhash (it worked
in the past, but seems recent changes made it doesn't work again), use
the basehash when there is no taskhash, just like what dump_sigtask
does.

[YOCTO #1229]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/siggen.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Richard Purdie - March 12, 2012, 2:21 a.m.
On Tue, 2012-03-06 at 14:04 +0800, Robert Yang wrote:
> The bitbake-runtask doesn't work since there is no taskhash (it worked
> in the past, but seems recent changes made it doesn't work again), use
> the basehash when there is no taskhash, just like what dump_sigtask
> does.
> 
> [YOCTO #1229]
> 
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>  bitbake/lib/bb/siggen.py |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 975ae41..39f44a2 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -219,7 +219,11 @@  class SignatureGeneratorBasicHash(SignatureGeneratorBasic):
             k = fn + "." + taskname[:-9]
         else:
             k = fn + "." + taskname
-        h = self.taskhash[k]
+        if k in self.taskhash:
+            h = self.taskhash[k]
+        else:
+            # If k is not in basehash, then error
+            h = self.basehash[k]
         return ("%s.%s.%s.%s" % (stampbase, taskname, h, extrainfo)).rstrip('.')
 
 def dump_this_task(outfile, d):