From eba30f3c179f1d91cefa8c7bef85667a48019bb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= Date: Wed, 22 May 2024 15:23:17 +0200 Subject: [PATCH] fix: do not catch bare exceptions Bare excepts will catch keyboard-exit exceptions, system-exit etc. which is probably not what we want. --- dangerzone/isolation_provider/container.py | 2 +- dangerzone/settings.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dangerzone/isolation_provider/container.py b/dangerzone/isolation_provider/container.py index 4b2de1f..5fec7d3 100644 --- a/dangerzone/isolation_provider/container.py +++ b/dangerzone/isolation_provider/container.py @@ -124,7 +124,7 @@ class Container(IsolationProvider): [Container.get_runtime(), "rmi", "--force", found_image_id], startupinfo=get_subprocess_startupinfo(), ) - except: + except Exception: log.warning("Couldn't delete old container image, so leaving it there") return installed diff --git a/dangerzone/settings.py b/dangerzone/settings.py index 596b5fd..32026d6 100644 --- a/dangerzone/settings.py +++ b/dangerzone/settings.py @@ -79,7 +79,7 @@ class Settings: if version.parse(get_version()) > version.parse(self.get(key)): self.set(key, get_version()) - except: + except Exception: log.error("Error loading settings, falling back to default") self.settings = self.default_settings