summaryrefslogtreecommitdiff
path: root/src/leap/base/config.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-10-11 07:22:49 +0900
committerkali <kali@leap.se>2012-10-11 07:22:49 +0900
commita964b9e55a53b1d87d296e0f3b5295b0366c5967 (patch)
treee37e3b6f82a8e06497bc556e6e8467f6ce647d26 /src/leap/base/config.py
parent272d72506d667ae4dc8719066422f782983e6746 (diff)
comment out the set_password call until we fix #744
Diffstat (limited to 'src/leap/base/config.py')
-rw-r--r--src/leap/base/config.py23
1 files changed, 4 insertions, 19 deletions
diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 642470e6..cf01d1aa 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -221,25 +221,10 @@ def get_config_dir():
# get a more sensible path for win/mac
# kclair: opinion? ^^
- # XXX DEBUG for #744
- #logger.debug('expanduser? --- %s', os.path.expanduser('~'))
- #logger.debug('$HOME? --- %s', os.environ.get('HOME', None))
- #logger.debug('user? --- %s', os.getlogin())
-
- try:
- return os.path.expanduser(
- os.path.join('~',
- '.config',
- 'leap'))
- except RuntimeError:
- # We're getting a recursion error
- # that I suspect is caused by some bug on
- # expanduser...
- return os.path.join(
- 'home',
- '%s' % os.getlogin(),
- '.config',
- 'leap')
+ return os.path.expanduser(
+ os.path.join('~',
+ '.config',
+ 'leap'))
def get_config_file(filename, folder=None):