From a964b9e55a53b1d87d296e0f3b5295b0366c5967 Mon Sep 17 00:00:00 2001 From: kali Date: Thu, 11 Oct 2012 07:22:49 +0900 Subject: comment out the set_password call until we fix #744 --- src/leap/base/config.py | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/leap/base') 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): -- cgit v1.2.3