[oe-commits] [bitbake] 01/04: bitbake: runqueue: __find_md5__ -> __find_sha256

[git at git.openembedded.org]

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

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

commit 15d20d948359fa1d7a7a754b2a1d8ed9f4ca0480
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Jan 11 16:49:53 2019 +0800

    bitbake: runqueue: __find_md5__ -> __find_sha256
    
    Fixed:
    Create a new build
    $ bitbake quilt-native -ccleansstate -Snone
    $ bitbake quilt-native -ccleansstate -Sprintdiff
    
    [snip]
         latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1]
    >    prevh = __find_md5__.search(latestmatch).group(0)
         output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb)
    AttributeError: 'NoneType' object has no attribute 'group'
    
    Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/runqueue.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py
index 704a6c4..adafa80 100644
--- a/lib/bb/runqueue.py
+++ b/lib/bb/runqueue.py
@@ -41,7 +41,7 @@ from multiprocessing import Process
 bblogger = logging.getLogger("BitBake")
 logger = logging.getLogger("BitBake.RunQueue")
 
-__find_md5__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{32}(?![a-z0-9])' )
+__find_sha256__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{64}(?![a-z0-9])' )
 
 def fn_from_tid(tid):
      return tid.rsplit(":", 1)[0]
@@ -1676,7 +1676,7 @@ class RunQueue:
             matches = {k : v for k, v in iter(matches.items()) if h not in k}
             if matches:
                 latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1]
-                prevh = __find_md5__.search(latestmatch).group(0)
+                prevh = __find_sha256__.search(latestmatch).group(0)
                 output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb)
                 bb.plain("\nTask %s:%s couldn't be used from the cache because:\n  We need hash %s, closest matching task was %s\n  " % (pn, taskname, h, prevh) + '\n  '.join(output))
 

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