summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 11:20:33 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-11-25 11:25:59 +0000
commit4bf73cbbe204b1175f7a92322a440a6642ffc083 (patch)
treedac14e9ff3d7aa52b8034a6bdd370ff61d26650f
parent37c4f373e42b54f6c65b8482bd1172563fbc1ea5 (diff)
downloadpoky-4bf73cbbe204b1175f7a92322a440a6642ffc083.tar.gz
bitbake/siggen.py: Don't backtrace if the taskhash data isn't present
This allows the code to safely fall back to dumping the basehash data if the taskhash data isn't present for some reason. We could effecitvely obsolete the runtime option and use this approach instead exclusively. (Bitbake rev: 5ace320ccc01f4e326f90b7ba060dcbff3380dca) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/siggen.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 758074287d..91b4160b2d 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -159,7 +159,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
159 k = fn + "." + task 159 k = fn + "." + task
160 if runtime == "customfile": 160 if runtime == "customfile":
161 sigfile = stampbase 161 sigfile = stampbase
162 elif runtime: 162 elif runtime and k in self.taskhash:
163 sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k] 163 sigfile = stampbase + "." + task + ".sigdata" + "." + self.taskhash[k]
164 else: 164 else:
165 sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k] 165 sigfile = stampbase + "." + task + ".sigbasedata" + "." + self.basehash[k]
@@ -180,7 +180,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
180 data['gendeps'][dep] = self.gendeps[fn][dep] 180 data['gendeps'][dep] = self.gendeps[fn][dep]
181 data['varvals'][dep] = self.lookupcache[fn][dep] 181 data['varvals'][dep] = self.lookupcache[fn][dep]
182 182
183 if runtime: 183 if runtime and k in self.taskhash:
184 data['runtaskdeps'] = self.runtaskdeps[k] 184 data['runtaskdeps'] = self.runtaskdeps[k]
185 data['runtaskhashes'] = {} 185 data['runtaskhashes'] = {}
186 for dep in data['runtaskdeps']: 186 for dep in data['runtaskdeps']: