util_win32: fix Windows version checking (issue1358)
authorPatrick Mezard <pmezard@gmail.com>
Wed, 26 Nov 2008 22:27:37 +0100
changeset 7427 f21e3d0e335b
parent 7421 4c4324476be6
child 7428 fdcde929ce4f
util_win32: fix Windows version checking (issue1358) shell.SHGetPathFromIDList() segfaults when called in Apache.
mercurial/util_win32.py
--- a/mercurial/util_win32.py	Wed Nov 26 18:23:35 2008 +0100
+++ b/mercurial/util_win32.py	Wed Nov 26 22:27:37 2008 +0100
@@ -245,7 +245,7 @@
 def user_rcpath_win32():
     '''return os-specific hgrc search path to the user dir'''
     userdir = os.path.expanduser('~')
-    if sys.getwindowsversion() != 2 and userdir == '~':
+    if sys.getwindowsversion()[3] != 2 and userdir == '~':
         # We are on win < nt: fetch the APPDATA directory location and use
         # the parent directory as the user home dir.
         appdir = shell.SHGetPathFromIDList(