summaryrefslogtreecommitdiffstats
path: root/meta/classes/sstate.bbclass
diff options
context:
space:
mode:
authorRoss Burton <ross@burtonini.com>2021-10-14 17:33:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-11-03 11:18:56 +0000
commit3f2e26f122e540e997e422ca6b697f7a67a9e630 (patch)
tree4375b46307548ff27897c1089cc3298a5ff379d7 /meta/classes/sstate.bbclass
parent4b863f98e27143cf874d8fe8f0bb426aa590b75a (diff)
downloadpoky-3f2e26f122e540e997e422ca6b697f7a67a9e630.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: f16803718a19ace7b582c5b73924fe3112502927) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/sstate.bbclass')
-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 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,
950 found.add(tid) 950 found.add(tid)
951 if tid in missed: 951 if tid in missed:
952 missed.remove(tid) 952 missed.remove(tid)
953 except: 953 except bb.fetch2.FetchError as e:
954 missed.add(tid) 954 missed.add(tid)
955 bb.debug(2, "SState: Unsuccessful fetch test for %s" % srcuri) 955 bb.debug(2, "SState: Unsuccessful fetch test for %s (%s)" % (srcuri, e))
956 pass 956 except Exception as e:
957 bb.error("SState: cannot test %s: %s" % (srcuri, e))
957 if len(tasklist) >= min_tasks: 958 if len(tasklist) >= min_tasks:
958 bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d) 959 bb.event.fire(bb.event.ProcessProgress(msg, len(tasklist) - thread_worker.tasks.qsize()), d)
959 960