From 235603e715db114ddb9f7e2445b395b4bbcda535 Mon Sep 17 00:00:00 2001 From: s3lph <1375407-s3lph@users.noreply.gitlab.com> Date: Sun, 17 Apr 2022 01:11:48 +0200 Subject: [PATCH] Broader exception clause for conflict mail encryption --- multischleuder/conflict.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/multischleuder/conflict.py b/multischleuder/conflict.py index c894de7..2e48f16 100644 --- a/multischleuder/conflict.py +++ b/multischleuder/conflict.py @@ -76,7 +76,7 @@ class ConflictMessage: # support every possible key algorithm yet, esp. it can't encrypt to ed25519 keys. try: mime: email.mime.base.MIMEBase = self._encrypt_message(msg) - except pgpy.errors.PGPEncryptionError: + except Exception: mime = email.mime.text.MIMEText(msg, _subtype='plain', _charset='utf-8') # Set all the email headers mime['Subject'] = f'MultiSchleuder {self._schleuder} - Key Conflict'