runqueue: Handle cases where siginfo is now a parameter to the hashvadlidate function

PATCH New Richard Purdie 1 participant 1 message May 14, 2015

Share & tools

Richard Purdie

author

2015-05-14 09:34 UTC #0 lore raw

PATCH 1/1 runqueue: Handle cases where siginfo is now a parameter to the hashvadlidate function

In some cases we need to check specifically for siginfo files, in some cases we need to check for the actual sstate objects themselves.

Therefore make this a parameter to the function. A fallback to the previous function style is maintained for now.

Signed-off-by Richard Purdie <[email protected]>

bitbake/lib/bb/runqueue.py +7 -2

index 4a1992a..52bb12f 100644
@@ -1205,9 +1205,14 @@ class RunQueue:
             sq_hash.append(self.rqdata.runq_hash[task])
             sq_taskname.append(taskname)
             sq_task.append(task)
-        call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
         locs = { "sq_fn" : sq_fn, "sq_task" : sq_taskname, "sq_hash" : sq_hash, "sq_hashfn" : sq_hashfn, "d" : self.cooker.expanded_data }
-        valid = bb.utils.better_eval(call, locs)
+        try:
+            call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d, siginfo=True)"
+            valid = bb.utils.better_eval(call, locs)
+        # Handle version with no siginfo parameter
+        except TypeError:
+            call = self.hashvalidate + "(sq_fn, sq_task, sq_hash, sq_hashfn, d)"
+            valid = bb.utils.better_eval(call, locs)
         for v in valid:
             valid_new.add(sq_task[v])