diff options
| author |   Ross Burton <ross@burtonini.com> | 2021-10-14 17:33:19 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-10-29 04:48:40 -1000 |
| commit | f16803718a19ace7b582c5b73924fe3112502927 (patch) | |
| tree | f6490cef20a99015094833267065104ff59ba00a /meta | |
| parent | b20699229671ef37daac8b0ed1133aacb477f6a0 (diff) | |
| download | openembedded-core-contrib-f16803718a19ace7b582c5b73924fe3112502927.tar.gz | |
sstate: don't silently handle all exceptions in sstate_checkhashes
If checkstatus returns an exception we should silently handle
FetchError, as this means the fetch failed for 'normal' reasons such as
file not found. However, other exceptions may be raised, and these
should be made visible.
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 50d99faf88a1d82cbd939b9bd6e33ebed2b1ffd8)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/sstate.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index a2496dce2b..38dc3bff30 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -950,10 +950,11 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, found.add(tid) if tid in missed: missed.remove(tid) - except: + except bb.fetch2.FetchError as e: missed.add(tid) - bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri) - pass + bb.debug(2, "SState: Unsuccessful fetch test for %s (%s)" % (srcuri, e)) + except Exception as e: + bb.error("SState: cannot test %s: %s" % (srcuri, e)) if len(tasklist) >= min_tasks: bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d) |