mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-03-11 14:49:16 +00:00
Code Issues Releases Wiki Activity

Minor: Add hidden keyring imports for macOS

Browse source
This commit is contained in:
Manu 2021-03-03 21:50:14 +08:00
parent 7dc6f83b92
commit 2b009c517f
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/vorta.spec
View file

@ -28,6 +28,9 @@ a = Analysis([os.path.join(SRC_DIR, '__main__.py')],
hiddenimports=[ hiddenimports=[
'vorta.views.dark.collection_rc', 'vorta.views.dark.collection_rc',
'vorta.views.light.collection_rc', 'vorta.views.light.collection_rc',
'vorta.keyring.darwin',
'vorta.keyring.kwallet',
'vorta.keyring.secretstorage',
'pkg_resources.py2_warn', 'pkg_resources.py2_warn',
], ],
hookspath=[], hookspath=[],

9
src/vorta/keyring/abc.py
View file

@ -1,6 +1,9 @@
import importlib import importlib
import logging
from vorta.i18n import trans_late from vorta.i18n import trans_late
logger = logging.getLogger(__name__)
class VortaKeyring: class VortaKeyring:
all_keyrings = [ all_keyrings = [
@ -20,13 +23,15 @@ class VortaKeyring:
try: try:
keyring = getattr(importlib.import_module(_module, package='vorta.keyring'), _class) keyring = getattr(importlib.import_module(_module, package='vorta.keyring'), _class)
available_keyrings.append((keyring, keyring.get_priority())) available_keyrings.append((keyring, keyring.get_priority()))
except Exception: except Exception as e:
logger.debug(e)
continue continue
for keyring, _ in sorted(available_keyrings, key=lambda k: k[1], reverse=True): for keyring, _ in sorted(available_keyrings, key=lambda k: k[1], reverse=True):
try: try:
return keyring() return keyring()
except Exception: except Exception as e:
logger.debug(e)
continue continue
def get_backend_warning(self): def get_backend_warning(self):