runqueue: Improve timestamp comparisons

PATCH New Richard Purdie 1 participant 1 message May 11, 2016

Share & tools

Richard Purdie

author

2016-05-11 22:06 UTC #0 lore raw

PATCH 1/1 runqueue: Improve timestamp comparisons

python3 cares more about invalid type comparisons. Add break statements and better tests to make the code paths clearer and avoid type issues in python3. No code functionality change.

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

bitbake/lib/bb/runqueue.py +5 -1

index 8b3fe5a..aaaafc5 100644
@@ -1085,15 +1085,19 @@ class RunQueue:
                 stampfile3 = bb.build.stampfile(taskname2 + "_setscene", self.rqdata.dataCache, fn2)
                 t2 = get_timestamp(stampfile2)
                 t3 = get_timestamp(stampfile3)
+                if t3 and not t2:
+                    continue
                 if t3 and t3 > t2:
-                   continue
+                    continue
                 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist):
                     if not t2:
                         logger.debug(2, 'Stampfile %s does not exist', stampfile2)
                         iscurrent = False
+                        break
                     if t1 < t2:
                         logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2)
                         iscurrent = False
+                        break
                     if recurse and iscurrent:
                         if dep in cache:
                             iscurrent = cache[dep]