diff options
| author | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-15 22:51:26 (GMT) |
|---|---|---|
| committer | Alexandre Vassalotti <alexandre@peadrop.com> | 2008-05-15 22:51:26 (GMT) |
| commit | a79e33e039530e5ca62f5dc19981cf76f4dcf824 (patch) | |
| tree | 86e4ab28a152b7556ede0e27ba4310a7293cd0b4 /Tools/msi/msisupport.c | |
| parent | 6461e10158db1f1d41dc9449e233551b2889ebb5 (diff) | |
| download | cpython-a79e33e039530e5ca62f5dc19981cf76f4dcf824.zip cpython-a79e33e039530e5ca62f5dc19981cf76f4dcf824.tar.gz cpython-a79e33e039530e5ca62f5dc19981cf76f4dcf824.tar.bz2 | |
Merged revisions 62954-62959,62961,62963-62967,62969-62970,62972-62973,62975-62976,62978-62982,62984,62987-62996 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r62954 | martin.v.loewis | 2008-05-09 16:11:37 -0400 (Fri, 09 May 2008) | 1 line
Port to VS 2008. Drop W9x support.
........
r62957 | benjamin.peterson | 2008-05-09 17:30:26 -0400 (Fri, 09 May 2008) | 2 lines
In stdtypes.rst, move methods under class directives where applicable
........
r62958 | brett.cannon | 2008-05-09 17:30:36 -0400 (Fri, 09 May 2008) | 2 lines
Add a todo list to the module deletion command.
........
r62963 | brett.cannon | 2008-05-09 18:52:28 -0400 (Fri, 09 May 2008) | 2 lines
Add support for extension modules in 3.0 deprection command.
........
r62967 | brett.cannon | 2008-05-09 22:25:00 -0400 (Fri, 09 May 2008) | 2 lines
Fix some errors in the deprecation warnings for new and user.
........
r62975 | brett.cannon | 2008-05-09 22:54:52 -0400 (Fri, 09 May 2008) | 3 lines
Suppress deprecations for packages as well when using
test.test_support.import_module().
........
r62976 | brett.cannon | 2008-05-09 22:57:03 -0400 (Fri, 09 May 2008) | 2 lines
Also ignore package deprecations.
........
r62982 | benjamin.peterson | 2008-05-09 23:08:17 -0400 (Fri, 09 May 2008) | 2 lines
Add the examples in the json module docstring as a doctest
........
r62992 | martin.v.loewis | 2008-05-10 09:24:09 -0400 (Sat, 10 May 2008) | 2 lines
Explicitly refer to current hhp file (2.6a3)
........
r62993 | skip.montanaro | 2008-05-10 10:48:49 -0400 (Sat, 10 May 2008) | 2 lines
Note the PyPI-edness of bsddb185 for people who might still need it.
........
r62994 | andrew.kuchling | 2008-05-10 13:36:24 -0400 (Sat, 10 May 2008) | 1 line
Docstring typo
........
r62995 | andrew.kuchling | 2008-05-10 13:37:05 -0400 (Sat, 10 May 2008) | 1 line
Document the 'line' argument
........
r62996 | andrew.kuchling | 2008-05-10 13:48:45 -0400 (Sat, 10 May 2008) | 1 line
#1625509: describe behaviour of import lock
........
Diffstat (limited to 'Tools/msi/msisupport.c')
| -rw-r--r-- | Tools/msi/msisupport.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Tools/msi/msisupport.c b/Tools/msi/msisupport.c index b293bfc..f60a356 100644 --- a/Tools/msi/msisupport.c +++ b/Tools/msi/msisupport.c @@ -1,8 +1,6 @@ #include "windows.h" #include "msiquery.h" -int isWinNT; - /* Print a debug message to the installer log file. * To see the debug messages, install with * msiexec /i pythonxy.msi /l*v python.log @@ -30,21 +28,14 @@ UINT __declspec(dllexport) __stdcall CheckDir(MSIHANDLE hInstall) DWORD size = PSIZE; DWORD attributes; - isWinNT = (GetVersion() < 0x80000000) ? 1 : 0; - if (isWinNT) - result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size); - else - result = MsiGetPropertyA(hInstall, "TARGETDIR", path, &size); + result = MsiGetPropertyW(hInstall, L"TARGETDIR", wpath, &size); if (result != ERROR_SUCCESS) return result; wpath[size] = L'\0'; path[size] = L'\0'; - if (isWinNT) - attributes = GetFileAttributesW(wpath); - else - attributes = GetFileAttributesA(path); + attributes = GetFileAttributesW(wpath); if (attributes == INVALID_FILE_ATTRIBUTES || !(attributes & FILE_ATTRIBUTE_DIRECTORY)) { |