From: Robin Dunn <robin@alldunn.com>
Date: Sat, 28 Jul 2001 03:07:18 +0000 (+0000)
Subject: The installer should also check HKCU for the python install dir, since
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/30cd05ed0e36568dd01c7156411e8d648e0143d0?ds=sidebyside

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 c8750b4e80..78cba8bd89 100644
--- 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
-        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;