diff options
| -rw-r--r-- | src/leap/base/config.py | 23 | ||||
| -rwxr-xr-x | src/leap/gui/firstrunwizard.py | 7 |
2 files changed, 9 insertions, 21 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): diff --git a/src/leap/gui/firstrunwizard.py b/src/leap/gui/firstrunwizard.py index 6f2c83ce..a76865fd 100755 --- a/src/leap/gui/firstrunwizard.py +++ b/src/leap/gui/firstrunwizard.py @@ -167,7 +167,7 @@ class FirstRunWizard(QtGui.QWizard): """ provider = self.get_provider() username = self.field('userName') - password = self.field('userPassword') + #password = self.field('userPassword') remember_pass = self.field('rememberPassword') logger.debug('chosen provider: %s', provider) @@ -185,7 +185,10 @@ class FirstRunWizard(QtGui.QWizard): seed = self.get_random_str(10) settings.setValue("%s_seed" % provider, seed) - leapkeyring.leap_set_password(username, password, seed=seed) + # Commenting out for 0.2.0 release + # since we did not fix #744 on time. + + #leapkeyring.leap_set_password(username, password, seed=seed) logger.debug('First Run Wizard Done.') cb = self.success_cb |