Ignore /bin/bash when selecting the correct shell for a user. Closes LP#1122031

This commit is contained in:
Chris Jones 2013-02-27 17:47:35 +00:00
parent bab9f3c1a1
commit 865c343e80
1 changed files with 1 additions and 2 deletions

View File

@ -125,8 +125,7 @@ def shell_lookup():
usershell = pwd.getpwuid(os.getuid())[6] usershell = pwd.getpwuid(os.getuid())[6]
except KeyError: except KeyError:
usershell = None usershell = None
shells = [os.getenv('SHELL'), usershell, 'bash', shells = [usershell, 'bash', 'zsh', 'tcsh', 'ksh', 'csh', 'sh']
'zsh', 'tcsh', 'ksh', 'csh', 'sh']
for shell in shells: for shell in shells:
if shell is None: if shell is None: