]> code.ossystems Code Review - openembedded-core.git/commitdiff
sstate: don't silently handle all exceptions in sstate_checkhashes
authorRoss Burton <ross@burtonini.com>
Thu, 14 Oct 2021 16:33:19 +0000 (17:33 +0100)
committerSteve Sakoman <steve@sakoman.com>
Fri, 29 Oct 2021 14:48:40 +0000 (04:48 -1000)
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>
meta/classes/sstate.bbclass

index a2496dce2b788d4ba0fc662213207fbdbbfc7884..38dc3bff306c7d348f619241072d8e045077f976 100644 (file)
@@ -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)