From b758174236999b4802b4acd716303be6403c2b7a Mon Sep 17 00:00:00 2001 From: Andrew Gunnerson Date: Wed, 15 Feb 2023 00:20:15 -0500 Subject: [PATCH] Fix skipped cleanup logic caused by fixing bare except lint warnings This fixes temporary output files sometimes not being cleaned up and openssl cms sometimes not being killed when the user interrupts the process. Signed-off-by: Andrew Gunnerson --- avbroot/ota.py | 2 +- avbroot/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/avbroot/ota.py b/avbroot/ota.py index aa54161..e86081f 100644 --- a/avbroot/ota.py +++ b/avbroot/ota.py @@ -701,7 +701,7 @@ def open_signing_wrapper(f, privkey, passphrase, cert): process.stdin.close() signature = process.stdout.read() - except Exception: + except BaseException: process.kill() raise finally: diff --git a/avbroot/util.py b/avbroot/util.py index aea63a1..26a7015 100644 --- a/avbroot/util.py +++ b/avbroot/util.py @@ -33,7 +33,7 @@ def open_output_file(path): pass os.rename(f.name, path) - except Exception: + except BaseException: os.unlink(f.name) raise