equal
deleted
inserted
replaced
515 def getuser(): |
515 def getuser(): |
516 '''return name of current user''' |
516 '''return name of current user''' |
517 try: |
517 try: |
518 return getpass.getuser() |
518 return getpass.getuser() |
519 except ImportError: |
519 except ImportError: |
520 return getuser_fallback and getuser_fallback() |
520 if getuser_fallback: |
|
521 return getuser_fallback() |
521 raise util.Abort(_('user name not available - set USERNAME ' |
522 raise util.Abort(_('user name not available - set USERNAME ' |
522 'environment variable')) |
523 'environment variable')) |
523 |
524 |
524 # Platform specific variants |
525 # Platform specific variants |
525 if os.name == 'nt': |
526 if os.name == 'nt': |