diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-20 21:36:36 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-27 11:14:44 +0000 |
commit | 43a3f471893f5b5cbb3c15e67031a6c17f40a3b6 (patch) | |
tree | 5056b3aa9ebefb9f5b02ae787735c6b6cfda5521 /bitbake/lib/bb/runqueue.py | |
parent | 9a4855bc7fea2a3d7fd72b86abb1a1411cc00333 (diff) | |
download | poky-43a3f471893f5b5cbb3c15e67031a6c17f40a3b6.tar.gz |
bitbake: runqueue: Only attempt to print closest matching task if there is a match
(Bitbake rev: 1dbf400c662354b7826b2b97ee2e3e6d11af9fd2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/runqueue.py')
-rw-r--r-- | bitbake/lib/bb/runqueue.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py index 457723603a..bf2dc5494d 100644 --- a/bitbake/lib/bb/runqueue.py +++ b/bitbake/lib/bb/runqueue.py | |||
@@ -1224,12 +1224,11 @@ class RunQueue: | |||
1224 | if match is None: | 1224 | if match is None: |
1225 | bb.fatal("Can't find a task we're supposed to have written out? (hash: %s)?" % h) | 1225 | bb.fatal("Can't find a task we're supposed to have written out? (hash: %s)?" % h) |
1226 | matches = {k : v for k, v in matches.iteritems() if h not in k} | 1226 | matches = {k : v for k, v in matches.iteritems() if h not in k} |
1227 | latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1] | 1227 | if len(matches): |
1228 | prevh = __find_md5__.search(latestmatch).group(0) | 1228 | latestmatch = sorted(matches.keys(), key=lambda f: matches[f])[-1] |
1229 | output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb) | 1229 | prevh = __find_md5__.search(latestmatch).group(0) |
1230 | 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)) | 1230 | output = bb.siggen.compare_sigfiles(latestmatch, match, recursecb) |
1231 | 1231 | 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)) | |
1232 | |||
1233 | 1232 | ||
1234 | class RunQueueExecute: | 1233 | class RunQueueExecute: |
1235 | 1234 | ||