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-11 11:23:11 +0000 |
| commit | 15d20d948359fa1d7a7a754b2a1d8ed9f4ca0480 (patch) | |
| tree | 1979a33353a3a81ed27cb580216e2c81a4ab74d4 | |
| parent | 5e7f4e77e27bceaf6c68137cacb4f8d7d7de49dd (diff) | |
| download | bitbake-15d20d948359fa1d7a7a754b2a1d8ed9f4ca0480.tar.gz | |
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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/runqueue.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/bb/runqueue.py b/lib/bb/runqueue.py index 704a6c45d..adafa8077 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)) |