From 664fb2753798da8f4ea6a5556c6ada986fdda8e9 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 6 Mar 2012 14:04:36 +0800 Subject: siggen.py: Use basehash if no taskhash 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] (Bitbake rev: b36f2e3803dfc494d5b171759f55faf33708e6f1) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- bitbake/lib/bb/siggen.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'bitbake/lib/bb/siggen.py') diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index eaef4a85ae..8c79b178fb 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py @@ -223,7 +223,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): -- cgit v1.2.3-54-g00ecf