summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-11 22:55:14 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-13 13:41:32 +0100
commit6cc681806843a89a5bcaa0e733f8a97d88f1a8c2 (patch)
treec82274d83100fc22e5bbd218393c559bcbde2d4f
parentfce8da957fd2bbf1c3b02dfe34bc18a0bce37d65 (diff)
downloadpoky-6cc681806843a89a5bcaa0e733f8a97d88f1a8c2.tar.gz
bitbake: 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. (Bitbake rev: 2c39ebdd2762d027f007a6a769fdf023cdf3da2b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/runqueue.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 8b3fe5a957..aaaafc594f 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1085,15 +1085,19 @@ class RunQueue:
1085 stampfile3 = bb.build.stampfile(taskname2 + "_setscene", self.rqdata.dataCache, fn2) 1085 stampfile3 = bb.build.stampfile(taskname2 + "_setscene", self.rqdata.dataCache, fn2)
1086 t2 = get_timestamp(stampfile2) 1086 t2 = get_timestamp(stampfile2)
1087 t3 = get_timestamp(stampfile3) 1087 t3 = get_timestamp(stampfile3)
1088 if t3 and not t2:
1089 continue
1088 if t3 and t3 > t2: 1090 if t3 and t3 > t2:
1089 continue 1091 continue
1090 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist): 1092 if fn == fn2 or (fulldeptree and fn2 not in stampwhitelist):
1091 if not t2: 1093 if not t2:
1092 logger.debug(2, 'Stampfile %s does not exist', stampfile2) 1094 logger.debug(2, 'Stampfile %s does not exist', stampfile2)
1093 iscurrent = False 1095 iscurrent = False
1096 break
1094 if t1 < t2: 1097 if t1 < t2:
1095 logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2) 1098 logger.debug(2, 'Stampfile %s < %s', stampfile, stampfile2)
1096 iscurrent = False 1099 iscurrent = False
1100 break
1097 if recurse and iscurrent: 1101 if recurse and iscurrent:
1098 if dep in cache: 1102 if dep in cache:
1099 iscurrent = cache[dep] 1103 iscurrent = cache[dep]