[1.0.X] Fixed #5753 -- Allow createsuperuser to work in situations where there

might be a valid password database entry for the current user id.

Backport of r9158 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9159 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2008-10-06 04:56:50 +00:00
parent 48f4388c8b
commit c201d14269
1 changed files with 5 additions and 3 deletions

View File

@ -57,10 +57,12 @@ class Command(BaseCommand):
# Try to determine the current system user's username to use as a default.
try:
import pwd
except ImportError:
default_username = ''
else:
default_username = pwd.getpwuid(os.getuid())[0].replace(' ', '').lower()
except (ImportError, KeyError):
# KeyError will be raised by getpwuid() if there is no
# corresponding entry in the /etc/passwd file (a very restricted
# chroot environment, for example).
default_username = ''
# Determine whether the default username is taken, so we don't display
# it as an option.