diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-01-11 16:49:53 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-14 11:36:49 +0000 |
commit | 34ce32a75bf2dba51cf11192be9d9563e2952840 (patch) | |
tree | ab569c2bdce5a0872667dfedd9919c06824c9ebc /bitbake/lib | |
parent | dfd833725dab28015474359754883a67bbc80cc6 (diff) | |
download | poky-34ce32a75bf2dba51cf11192be9d9563e2952840.tar.gz |
bitbake: 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'
(Bitbake rev: 15d20d948359fa1d7a7a754b2a1d8ed9f4ca0480)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 704a6c45d4..adafa80770 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -41,7 +41,7 @@ from multiprocessing import Process | |||
41 | bblogger = logging.getLogger("BitBake") | 41 | bblogger = logging.getLogger("BitBake") |
42 | logger = logging.getLogger("BitBake.RunQueue") | 42 | logger = logging.getLogger("BitBake.RunQueue") |
43 | 43 | ||
44 | __find_md5__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{32}(?![a-z0-9])' ) | 44 | __find_sha256__ = re.compile( r'(?i)(?<![a-z0-9])[a-f0-9]{64}(?![a-z0-9])' ) |
45 | 45 | ||
46 | def fn_from_tid(tid): | 46 | def fn_from_tid(tid): |
47 | return tid.rsplit(":", 1)[0] | 47 | return tid.rsplit(":", 1)[0] |
@@ -1676,7 +1676,7 @@ class RunQueue: | |||
1676 | matches = {k : v for k, v in iter(matches.items()) if h not in k} | 1676 | matches = {k : v for k, v in iter(matches.items()) if h not in k} |
1677 | if matches: | 1677 | if matches: |
1678 | latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1] | 1678 | latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1] |
1679 | prevh = __find_md5__.search(latestmatch).group(0) | 1679 | prevh = __find_sha256__.search(latestmatch).group(0) |
1680 | output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb) | 1680 | output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb) |
1681 | 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)) | 1681 | 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)) |
1682 | 1682 | ||