From 661215788752bb7b06e8ba16ac53051a67a451b3 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 11 Oct 2012 04:36:01 +0900
Subject: another attempt at fixing recursion error with expanduser

---
 src/leap/base/config.py | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/leap/base/config.py b/src/leap/base/config.py
index 57f9f1b7..776c0a49 100644
--- a/src/leap/base/config.py
+++ b/src/leap/base/config.py
@@ -220,10 +220,26 @@ 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',
-                     'leap'))
+
+    # 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')
 
 
 def get_config_file(filename, folder=None):
-- 
cgit v1.2.3