bitbake: runqueue: __find_md5__ -> __find_sha256
PATCH 1/1 bitbake: runqueue: __find_md5__ -> __find_sha256
In reply to Robert YangFixed:
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]
Quoted 1 line
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 <[email protected]>
--- bitbake/lib/bb/runqueue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
bitbake/lib/bb/runqueue.py +2 -2
@@ -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))
Signature · 1 line
2.7.4
cover bitbake: runqueue: __find_md5__ -> __find_sha256
The following changes since commit 4dd51032160897be4132242d6aaaf4dd1e5167da:
oeqa/sdk: add test to exercise Meson (2019-01-08 11:16:45 +0000)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/runqueue
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/runqueue
Robert Yang (1):
bitbake: runqueue: __find_md5__ -> __find_sha256
bitbake/lib/bb/runqueue.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
2.7.4