[oe-commits] [bitbake] 21/25: runqueue: Fix equiv hash handling build failures

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch 1.44
in repository bitbake.

commit 10058fe590c56ee3b4d2136b6e247c2d29ae47e6
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Dec 27 20:44:34 2019 +0000

    runqueue: Fix equiv hash handling build failures
    
    Regardless of whether we remapped the hash on the server or not, we need
    to have bitbake work as if we did as we need to match how the stamp files
    look.
    
    This change resolves build failures where tasks were rerunning when they
    shouldn't.
    
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
    (cherry picked from commit 40928f6991436cf687821015324483b205abfcb1)
    Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
 lib/bb/runqueue.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 729439e..f827998 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -2302,8 +2302,9 @@ class RunQueueExecute:
                     remapped = True
                 elif tid in self.scenequeue_covered or tid in self.sq_live:
                     # Already ran this setscene task or it running. Report the new taskhash
-                    remapped = bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
+                    bb.parse.siggen.report_unihash_equiv(tid, newhash, origuni, newuni, self.rqdata.dataCaches)
                     logger.info("Already covered setscene for %s so ignoring rehash (remap)" % (tid))
+                    remapped = True
 
                 if not remapped:
                     #logger.debug(1, "Task %s hash changes: %s->%s %s->%s" % (tid, orighash, newhash, origuni, newuni))

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