diff options
Diffstat (limited to 'meta/lib/oe/sstatesig.py')
-rw-r--r-- | meta/lib/oe/sstatesig.py | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/meta/lib/oe/sstatesig.py b/meta/lib/oe/sstatesig.py index b2316b12b8..f1abff0c45 100644 --- a/meta/lib/oe/sstatesig.py +++ b/meta/lib/oe/sstatesig.py | |||
@@ -151,6 +151,13 @@ class SignatureGeneratorOEBasicHashMixIn(object): | |||
151 | 151 | ||
152 | def get_taskhash(self, tid, deps, dataCache): | 152 | def get_taskhash(self, tid, deps, dataCache): |
153 | h = super(bb.siggen.SignatureGeneratorBasicHash, self).get_taskhash(tid, deps, dataCache) | 153 | h = super(bb.siggen.SignatureGeneratorBasicHash, self).get_taskhash(tid, deps, dataCache) |
154 | if tid in self.lockedhashes: | ||
155 | if self.lockedhashes[tid]: | ||
156 | return self.lockedhashes[tid] | ||
157 | else: | ||
158 | return h | ||
159 | |||
160 | h = super(bb.siggen.SignatureGeneratorBasicHash, self).get_taskhash(tid, deps, dataCache) | ||
154 | 161 | ||
155 | (mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid) | 162 | (mc, _, task, fn) = bb.runqueue.split_tid_mcfn(tid) |
156 | 163 | ||
@@ -187,17 +194,19 @@ class SignatureGeneratorOEBasicHashMixIn(object): | |||
187 | % (recipename, task, h, h_locked, var)) | 194 | % (recipename, task, h, h_locked, var)) |
188 | 195 | ||
189 | return h_locked | 196 | return h_locked |
197 | |||
198 | self.lockedhashes[tid] = False | ||
190 | #bb.warn("%s %s %s" % (recipename, task, h)) | 199 | #bb.warn("%s %s %s" % (recipename, task, h)) |
191 | return h | 200 | return h |
192 | 201 | ||
193 | def get_unihash(self, tid): | 202 | def get_unihash(self, tid): |
194 | if tid in self.lockedhashes: | 203 | if tid in self.lockedhashes and self.lockedhashes[tid]: |
195 | return self.lockedhashes[tid] | 204 | return self.lockedhashes[tid] |
196 | return super().get_unihash(tid) | 205 | return super().get_unihash(tid) |
197 | 206 | ||
198 | def dump_sigtask(self, fn, task, stampbase, runtime): | 207 | def dump_sigtask(self, fn, task, stampbase, runtime): |
199 | tid = fn + ":" + task | 208 | tid = fn + ":" + task |
200 | if tid in self.lockedhashes: | 209 | if tid in self.lockedhashes and self.lockedhashes[tid]: |
201 | return | 210 | return |
202 | super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigtask(fn, task, stampbase, runtime) | 211 | super(bb.siggen.SignatureGeneratorBasicHash, self).dump_sigtask(fn, task, stampbase, runtime) |
203 | 212 | ||