summaryrefslogtreecommitdiff
path: root/src/leap/bitmask/util
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 16:03:20 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2014-07-31 16:03:20 -0300
commit3b02e227cfa48074739eb4f6634a436e65923b61 (patch)
treed657ea7204500b0090fa4eeb1bf5f9dbdf6f1cff /src/leap/bitmask/util
parent429cc2681e74785e3e88b270730e246f3f9f3ce7 (diff)
parentd201ee8ff03905e008ce316bae81aa6cfe2caf58 (diff)
Merge remote-tracking branch 'chiiph/bug/more_keyring_fixes' into develop
Diffstat (limited to 'src/leap/bitmask/util')
-rw-r--r--src/leap/bitmask/util/keyring_helpers.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/leap/bitmask/util/keyring_helpers.py b/src/leap/bitmask/util/keyring_helpers.py
index 088e7b3d..2b729b65 100644
--- a/src/leap/bitmask/util/keyring_helpers.py
+++ b/src/leap/bitmask/util/keyring_helpers.py
@@ -50,11 +50,8 @@ def _get_keyring_with_fallback():
return None
kr = keyring.get_keyring()
if not canuse(kr):
- try:
- kr_klass = keyring.backends.SecretService
- kr = kr_klass.Keyring()
- except AttributeError:
- logger.warning("Keyring cannot find SecretService Backend")
+ logger.debug("No usable keyring found")
+ return None
logger.debug("Selected keyring: %s" % (kr.__class__,))
if not canuse(kr):
logger.debug("Not using default keyring since it is obsolete")