From 5e2f0c8120b69d63df8aedd7669ea108c20c8484 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 14 Oct 2021 17:33:19 +0100 Subject: 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. (From OE-Core rev: 50d99faf88a1d82cbd939b9bd6e33ebed2b1ffd8) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/sstate.bbclass | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 7f034d746a..3c179259e7 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -995,10 +995,11 @@ def sstate_checkhashes(sq_data, d, siginfo=False, currentcount=0, summary=True, foundNet.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) -- cgit v1.2.3-54-g00ecf