Mercurial > hg
changeset 2652:e6a41cbaa260
fix windows username problem.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Mon, 24 Jul 2006 09:11:26 -0700 |
| parents | 02b6fa7bbfbf |
| children | 8796d9991100 |
| files | mercurial/ui.py mercurial/util.py mercurial/util_win32.py |
| diffstat | 3 files changed, 15 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/ui.py Wed Jul 19 07:56:40 2006 -0700 +++ b/mercurial/ui.py Mon Jul 24 09:11:26 2006 -0700 @@ -197,7 +197,7 @@ user = os.environ.get("EMAIL") if user is None: try: - user = '%s@%s' % (getpass.getuser(), socket.getfqdn()) + user = '%s@%s' % (util.getuser(), socket.getfqdn()) except KeyError: raise util.Abort(_("Please specify a username.")) return user
--- a/mercurial/util.py Wed Jul 19 07:56:40 2006 -0700 +++ b/mercurial/util.py Mon Jul 24 09:11:26 2006 -0700 @@ -12,7 +12,7 @@ from i18n import gettext as _ from demandload import * -demandload(globals(), "cStringIO errno popen2 re shutil sys tempfile") +demandload(globals(), "cStringIO errno getpass popen2 re shutil sys tempfile") demandload(globals(), "os threading time") # used by parsedate @@ -510,6 +510,17 @@ except AttributeError: return os.name == 'nt' and 'command' in os.environ.get('comspec', '') +getuser_fallback = None + +def getuser(): + '''return name of current user''' + try: + return getpass.getuser() + except ImportError: + return getuser_fallback and getuser_fallback() + raise util.Abort(_('user name not available - set USERNAME ' + 'environment variable')) + # Platform specific variants if os.name == 'nt': demandload(globals(), "msvcrt")