From: Ross Burton Date: Thu, 14 Oct 2021 16:33:19 +0000 (+0100) Subject: sstate: don't silently handle all exceptions in sstate_checkhashes X-Git-Tag: yocto-3.1.12~42 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f16803718a19ace7b582c5b73924fe3112502927;p=openembedded-core.git 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 Signed-off-by: Richard Purdie (cherry picked from commit 50d99faf88a1d82cbd939b9bd6e33ebed2b1ffd8) Signed-off-by: Steve Sakoman --- 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)