traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Running the pre-install or post-install script did not work when 

Python was installed with the 'only for me' option. The registry key
had a hardcoded '2.3' in it where the python version chosen for
installation should be used instead.

Will backport myself.
This commit is contained in:
Thomas Heller 2004-12-01 18:18:08 +00:00
parent cdd6e4d753
commit 9cc5cb7c4b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
PC/bdist_wininst/install.c
View File

@ -611,12 +611,15 @@ PyMethodDef meth[] = {
static HINSTANCE LoadPythonDll(char *fname)
{
char fullpath[_MAX_PATH];
char subkey_name[80];
LONG size = sizeof(fullpath);
HINSTANCE h = LoadLibrary(fname);
if (h)
return h;
if (ERROR_SUCCESS != RegQueryValue(HKEY_CURRENT_USER,
"SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath",
wsprintf(subkey_name,
"SOFTWARE\\Python\\PythonCore\\%s.%s\\InstallPath",
py_major, py_minor);
if (ERROR_SUCCESS != RegQueryValue(HKEY_CURRENT_USER, subkey_name,
fullpath, &size))
return NULL;
strcat(fullpath, "\\");
@ -1793,7 +1796,7 @@ InstallFilesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
/* Strip the trailing backslash again */
python_dir[strlen(python_dir)-1] = '\0';
CheckRootKey(hwnd);
CheckRootKey(hwnd);
if (!OpenLogfile(python_dir))
break;