From 3b83c549ffb028e7d1c7257b73cdaecdb8ad0630 Mon Sep 17 00:00:00 2001 From: karimpwnz Date: Sat, 2 Jan 2021 04:46:21 +0200 Subject: [PATCH] Deal with locked exceptions elsewhere too --- jrnl/EncryptedJournal.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py index e672c563..0e1f2cbd 100644 --- a/jrnl/EncryptedJournal.py +++ b/jrnl/EncryptedJournal.py @@ -186,12 +186,14 @@ def set_keychain(journal_name, password): if password is None: try: keyring.delete_password("jrnl", journal_name) - except keyring.errors.PasswordDeleteError: + except (keyring.errors.KeyringLocked, keyring.errors.PasswordDeleteError): pass else: try: keyring.set_password("jrnl", journal_name, password) - except keyring.errors.NoKeyringError: + except (keyring.errors.KeyringLocked): + pass + except (keyring.errors.NoKeyringError): print( "Keyring backend not found. Please install one of the supported backends by visiting: https://pypi.org/project/keyring/", file=sys.stderr,