The installer should also check HKCU for the python install dir, since

ActivePython will use that key.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11200 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index c8750b4e80e736ee8132069dc4f4a3232036ce00..78cba8bd899c9e3d575e7317c0137377ebbaad59 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -181,9 +181,16 @@ begin
     if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
                                'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
                                '', PythonDir) then begin
     if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
                                'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
                                '', PythonDir) then begin

-        MsgBox('No installation of Python %(PYTHONVER)s found.  Aborting...',
-               mbConfirmation, MB_OK);
-        Result := false;
+
+        if not RegQueryStringValue(HKEY_CURRENT_USER,
+                                   'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
+                                   '', PythonDir) then begin
+
+            MsgBox('No installation of Python %(PYTHONVER)s found.  Aborting...',
+                   mbConfirmation, MB_OK);
+            Result := false;
+        end else
+            Result := true;

     end else
         Result := true;
 end;
     end else
         Result := true;
 end;