diff options
author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
---|---|---|
committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /scripts/install.py | |
parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'scripts/install.py')
-rwxr-xr-x | scripts/install.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/scripts/install.py b/scripts/install.py index 78b8880b95..7368af0b37 100755 --- a/scripts/install.py +++ b/scripts/install.py @@ -793,8 +793,13 @@ def _getuser(): import getpass return getpass.getuser() except ImportError: - import win32api - return win32api.GetUserName() + import ctypes + MAX_PATH = 260 # according to a recent WinDef.h + name = ctypes.create_unicode_buffer(MAX_PATH) + namelen = ctypes.c_int(len(name)) # len in chars, NOT bytes + if not ctypes.windll.advapi32.GetUserNameW(name, ctypes.byref(namelen)): + raise ctypes.WinError() + return name.value def _default_installable_cache(): """In general, the installable files do not change much, so find a |