[Python-checkins] cpython: Fixes default per-user install precompiling the standard library.

steve.dower python-checkins at python.org
Fri May 15 21:11:17 CEST 2015


https://hg.python.org/cpython/rev/b6fa81bcf118
changeset:   96066:b6fa81bcf118
user:        Steve Dower <steve.dower at microsoft.com>
date:        Fri May 15 12:10:53 2015 -0700
summary:
  Fixes default per-user install precompiling the standard library.

files:
  Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp |  13 ++++++---
  1 files changed, 8 insertions(+), 5 deletions(-)


diff --git a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
--- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
@@ -302,10 +302,17 @@
 
         case ID_INSTALL_JUST_FOR_ME_BUTTON:
             SavePageSettings();
-            
+
+            if (!QueryElevateForCrtInstall()) {
+                break;
+            }
+
             hr = _engine->SetVariableNumeric(L"InstallAllUsers", 0);
             ExitOnFailure(hr, L"Failed to set install scope");
 
+            hr = _engine->SetVariableNumeric(L"CompileAll", 0);
+            ExitOnFailure(hr, L"Failed to unset CompileAll");
+
             hr = BalGetStringVariable(L"DefaultJustForMeTargetDir", &defaultDir);
             BalExitOnFailure(hr, "Failed to get the default per-user install directory");
 
@@ -320,10 +327,6 @@
             ReleaseStr(targetDir);
             BalExitOnFailure(hr, "Failed to set install target directory");
 
-            if (!QueryElevateForCrtInstall()) {
-                break;
-            }
-
             OnPlan(BOOTSTRAPPER_ACTION_INSTALL);
             break;
 

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list