mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

bitbake: runqueue: Improve timestamp comparisons

Browse Source 
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.

(Bitbake rev: 2c39ebdd2762d027f007a6a769fdf023cdf3da2b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-05-11 22:55:14 +01:00
parent fce8da957f
commit 6cc6818068
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bitbake/lib/bb/runqueue.py
View File

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