From ccffefd667d53dcf6d3c9428a50865c9a69131f7 Mon Sep 17 00:00:00 2001 From: matejcik Date: Fri, 20 Mar 2020 11:18:18 +0100 Subject: [PATCH] core/boot: do not catch OSError in boot wait --- core/src/boot.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/boot.py b/core/src/boot.py index a2eeca40f..a8b5168fd 100644 --- a/core/src/boot.py +++ b/core/src/boot.py @@ -16,10 +16,14 @@ async def bootscreen() -> None: await verify_user_pin() storage.init_unlocked() return - except (OSError, PinCancelled) as e: + except PinCancelled as e: + # verify_user_pin will convert a SdCardUnavailable (in case of sd salt) + # to PinCancelled exception. + # log the exception and retry loop if __debug__: log.exception(__name__, e) except BaseException as e: + # other exceptions here are unexpected and should halt the device if __debug__: log.exception(__name__, e) utils.halt(e.__class__.__name__)