summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-10-14 17:33:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-18 13:48:17 +0100
commit5e2f0c8120b69d63df8aedd7669ea108c20c8484 (patch)
treedbc0ea91d334932012c722b0f098da5f990676a9 /meta/classes
parentf59811aeeb1fe7048c177c9ff0268bfc1a521b96 (diff)
downloadpoky-5e2f0c8120b69d63df8aedd7669ea108c20c8484.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. (From OE-Core rev: 50d99faf88a1d82cbd939b9bd6e33ebed2b1ffd8) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/sstate.bbclass7
1 files 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,
995 foundNet.add(tid) 995 foundNet.add(tid)
996 if tid in missed: 996 if tid in missed:
997 missed.remove(tid) 997 missed.remove(tid)
998 except: 998 except bb.fetch2.FetchError as e:
999 missed.add(tid) 999 missed.add(tid)
1000 bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri) 1000 bb.debug(2, "SState: Unsuccessful fetch test for %s (%s)" % (srcuri, e))
1001 pass 1001 except Exception as e:
1002 bb.error("SState: cannot test %s: %s" % (srcuri, e))
1002 if len(tasklist) >= min_tasks: 1003 if len(tasklist) >= min_tasks:
1003 bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d) 1004 bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d)
1004 1005