mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #25163: Display correct directory in installer when using non-default settings.

Browse source
This commit is contained in:
Steve Dower 2015-10-11 15:37:22 -07:00
parent 5700ae877f
commit 731f4a2c5f
4 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

58
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file

@ -293,28 +293,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
hr = _engine->SetVariableNumeric(L"CompileAll", installAllUsers);
ExitOnFailure(hr, L"Failed to update CompileAll");
hr = BalGetStringVariable(L"TargetDir", &targetDir);
if (FAILED(hr) || !targetDir || !targetDir[0]) {
ReleaseStr(targetDir);
targetDir = nullptr;
hr = BalGetStringVariable(
installAllUsers ? L"DefaultAllUsersTargetDir" : L"DefaultJustForMeTargetDir",
&defaultDir
);
BalExitOnFailure(hr, "Failed to get the default install directory");
if (!defaultDir || !defaultDir[0]) {
BalLogError(E_INVALIDARG, "Default install directory is blank");
}
hr = BalFormatString(defaultDir, &targetDir);
BalExitOnFailure1(hr, "Failed to format '%ls'", defaultDir);
hr = _engine->SetVariableString(L"TargetDir", targetDir);
BalExitOnFailure(hr, "Failed to set install target directory");
}
ReleaseStr(targetDir);
hr = EnsureTargetDir();
ExitOnFailure(hr, L"Failed to set TargetDir");
OnPlan(BOOTSTRAPPER_ACTION_INSTALL);
break;
@ -2972,6 +2952,39 @@ private:
return;
}
HRESULT EnsureTargetDir() {
LONGLONG installAllUsers;
LPWSTR targetDir = nullptr, defaultDir = nullptr;
HRESULT hr = BalGetStringVariable(L"TargetDir", &targetDir);
if (FAILED(hr) || !targetDir || !targetDir[0]) {
ReleaseStr(targetDir);
targetDir = nullptr;
hr = BalGetNumericVariable(L"InstallAllUsers", &installAllUsers);
ExitOnFailure(hr, L"Failed to get install scope");
hr = BalGetStringVariable(
installAllUsers ? L"DefaultAllUsersTargetDir" : L"DefaultJustForMeTargetDir",
&defaultDir
);
BalExitOnFailure(hr, "Failed to get the default install directory");
if (!defaultDir || !defaultDir[0]) {
BalLogError(E_INVALIDARG, "Default install directory is blank");
}
hr = BalFormatString(defaultDir, &targetDir);
BalExitOnFailure1(hr, "Failed to format '%ls'", defaultDir);
hr = _engine->SetVariableString(L"TargetDir", targetDir);
BalExitOnFailure(hr, "Failed to set install target directory");
}
LExit:
ReleaseStr(defaultDir);
ReleaseStr(targetDir);
return hr;
}
public:
//
// Constructor - initialize member variables.
@ -3057,6 +3070,7 @@ public:
_baFunction = nullptr;
LoadOptionalFeatureStates(pEngine);
EnsureTargetDir();
}