diff options
| author | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
|---|---|---|
| committer | kali <kali@leap.se> | 2014-08-08 19:10:39 -0500 |
| commit | cef0be0b4f866c9283eaf696fbc23b8120e40443 (patch) | |
| tree | ff54448f7354e56235d22dabaf0fb03597790c98 /src/leap/bitmask/util/keyring_helpers.py | |
| parent | a9173e8e2816b767028787735e4a84b2576f258d (diff) | |
| parent | 465c0b89ca61279eb036afec2de3b4d24b257311 (diff) | |
Merge branch '0.6.1-rc' into deb-0.6.1-rc
Conflicts:
pkg/linux/bitmask-root
src/leap/bitmask/gui/login.py
Diffstat (limited to 'src/leap/bitmask/util/keyring_helpers.py')
| -rw-r--r-- | src/leap/bitmask/util/keyring_helpers.py | 7 |
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 0512d988..c580f19e 100644 --- a/src/leap/bitmask/util/keyring_helpers.py +++ b/src/leap/bitmask/util/keyring_helpers.py @@ -54,11 +54,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") |