diff options
| author | kali <kali@leap.se> | 2012-10-11 07:27:57 +0900 |
|---|---|---|
| committer | kali <kali@leap.se> | 2012-10-11 07:27:57 +0900 |
| commit | 5dbe01e4dd22fba66d9553c062b89ae9c3a39256 (patch) | |
| tree | 325a1753bde43170903d95320f3e440c145a3fff /src/leap/crypto/leapkeyring.py | |
| parent | 5c86e71493c433fbee49a3fdc8f8f3a537b3311e (diff) | |
| parent | a964b9e55a53b1d87d296e0f3b5295b0366c5967 (diff) | |
Merge branch 'feature/fix-crypted-keyring' into develop
This is a temporary workaround until we find a good solution
to issue #744.
Some old versions of python-keyring are causing a recursion loop.
Diffstat (limited to 'src/leap/crypto/leapkeyring.py')
| -rw-r--r-- | src/leap/crypto/leapkeyring.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/leap/crypto/leapkeyring.py b/src/leap/crypto/leapkeyring.py index bb0ca147..bceadc75 100644 --- a/src/leap/crypto/leapkeyring.py +++ b/src/leap/crypto/leapkeyring.py @@ -1,7 +1,7 @@ -import os - import keyring +from leap.base.config import get_config_file + ############# # Disclaimer ############# @@ -20,7 +20,11 @@ import keyring class LeapCryptedFileKeyring(keyring.backend.CryptedFileKeyring): - filename = os.path.expanduser("~/.config/leap/.secrets") + filename = ".secrets" + + @property + def file_path(self): + return get_config_file(self.filename) def __init__(self, seed=None): self.seed = seed |