diff options
| -rw-r--r-- | bitbake/lib/bb/runqueue.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index b1fe6b8a7b..7ec3ab8fa8 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
| @@ -1154,9 +1154,14 @@ class RunQueue: | |||
| 1154 | sq_hash.append(self.rqdata.runq_hash[task]) | 1154 | sq_hash.append(self.rqdata.runq_hash[task]) |
| 1155 | sq_taskname.append(taskname) | 1155 | sq_taskname.append(taskname) |
| 1156 | sq_task.append(task) | 1156 | sq_task.append(task) |
| 1157 | call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" | ||
| 1158 | locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data } | 1157 | locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data } |
| 1159 | valid = bb.utils.better_eval(call, locs) | 1158 | try: |
| 1159 | call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=True)" | ||
| 1160 | valid = bb.utils.better_eval(call, locs) | ||
| 1161 | # Handle version with no siginfo parameter | ||
| 1162 | except TypeError: | ||
| 1163 | call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)" | ||
| 1164 | valid = bb.utils.better_eval(call, locs) | ||
| 1160 | for v in valid: | 1165 | for v in valid: |
| 1161 | valid_new.add(sq_task[v]) | 1166 | valid_new.add(sq_task[v]) |
| 1162 | 1167 | ||
