From 6ad89a26c8f88b7bf84e4f7c7c96c1b7fa2568b1 Mon Sep 17 00:00:00 2001 From: Peter Schmidbauer Date: Tue, 29 Oct 2019 18:17:44 +0100 Subject: [PATCH] Fix crash when no keyring backend available --- jrnl/util.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jrnl/util.py b/jrnl/util.py index bc36ba9b..5609cd7f 100644 --- a/jrnl/util.py +++ b/jrnl/util.py @@ -80,7 +80,10 @@ def get_password(validator, keychain=None, max_attempts=3): def get_keychain(journal_name): import keyring - return keyring.get_password('jrnl', journal_name) + try: + return keyring.get_password('jrnl', journal_name) + except RuntimeError: + return "" def set_keychain(journal_name, password): @@ -88,7 +91,7 @@ def set_keychain(journal_name, password): if password is None: try: keyring.delete_password('jrnl', journal_name) - except: + except RuntimeError: pass elif not TEST: keyring.set_password('jrnl', journal_name, password)