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/base | |
| 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/base')
| -rw-r--r-- | src/leap/base/config.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/leap/base/config.py b/src/leap/base/config.py index 57f9f1b7..cf01d1aa 100644 --- a/src/leap/base/config.py +++ b/src/leap/base/config.py @@ -220,6 +220,7 @@ def get_config_dir(): # check for $XDG_CONFIG_HOME var? # get a more sensible path for win/mac # kclair: opinion? ^^ + return os.path.expanduser( os.path.join('~', '.config', |