summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-03-06 14:04:36 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-03-12 02:26:23 +0000
commit664fb2753798da8f4ea6a5556c6ada986fdda8e9 (patch)
tree0e48af9d5a0def9582212b33934942554215b0bb
parentd599d90fd56a7ad12a376011453513d874b512de (diff)
downloadpoky-664fb2753798da8f4ea6a5556c6ada986fdda8e9.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py6
1 files changed, 5 insertions, 1 deletions
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):
223 k = fn + "." + taskname[:-9] 223 k = fn + "." + taskname[:-9]
224 else: 224 else:
225 k = fn + "." + taskname 225 k = fn + "." + taskname
226 h = self.taskhash[k] 226 if k in self.taskhash:
227 h = self.taskhash[k]
228 else:
229 # If k is not in basehash, then error
230 h = self.basehash[k]
227 return ("%s.%s.%s.%s" % (stampbase, taskname, h, extrainfo)).rstrip('.') 231 return ("%s.%s.%s.%s" % (stampbase, taskname, h, extrainfo)).rstrip('.')
228 232
229def dump_this_task(outfile, d): 233def dump_this_task(outfile, d):