[oe-commits] [bitbake] 02/11: runqueue: Improve timestamp comparisions

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 35298d5b5bbbd74b54c29b241cd6edfaa14125ac
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Wed May 11 14:19:32 2016 +0100

    runqueue: Improve timestamp comparisions
    
    python3 cares more about invalid type comparisions. Add break statements
    and better tests to make the codepaths clearer and avoid type issues
    in python3. No code funtionality change.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 8b3fe5a..aaaafc5 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -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]

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.