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

Issue #25081: Makes Back button in installer go back to upgrade page when upgrading.

Browse source
This commit is contained in:
Steve Dower 2015-09-22 16:36:33 -07:00
parent 14b9e6c6a7
commit 44fe401aa3
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Misc/NEWS
View file

@ -150,6 +150,9 @@ Build
Windows Windows
------- -------
- Issue #25081: Makes Back button in installer go back to upgrade page when
upgrading.
- Issue #25091: Increases font size of the installer. - Issue #25091: Increases font size of the installer.
- Issue #25126: Clarifies that the non-web installer will download some - Issue #25126: Clarifies that the non-web installer will download some

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

@ -323,6 +323,8 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
SavePageSettings(); SavePageSettings();
if (_modifying) { if (_modifying) {
GoToPage(PAGE_MODIFY); GoToPage(PAGE_MODIFY);
} else if (_upgrading) {
GoToPage(PAGE_UPGRADE);
} else { } else {
GoToPage(PAGE_INSTALL); GoToPage(PAGE_INSTALL);
} }
@ -2524,6 +2526,7 @@ private:
case BOOTSTRAPPER_ACTION_INSTALL: case BOOTSTRAPPER_ACTION_INSTALL:
if (_upgradingOldVersion) { if (_upgradingOldVersion) {
_installPage = PAGE_UPGRADE; _installPage = PAGE_UPGRADE;
_upgrading = TRUE;
} else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) { } else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) {
_installPage = PAGE_SIMPLE_INSTALL; _installPage = PAGE_SIMPLE_INSTALL;
} else { } else {
@ -3029,6 +3032,7 @@ public:
_suppressDowngradeFailure = FALSE; _suppressDowngradeFailure = FALSE;
_suppressRepair = FALSE; _suppressRepair = FALSE;
_modifying = FALSE; _modifying = FALSE;
_upgrading = FALSE;
_overridableVariables = nullptr; _overridableVariables = nullptr;
_taskbarList = nullptr; _taskbarList = nullptr;
@ -3113,6 +3117,7 @@ private:
BOOL _suppressDowngradeFailure; BOOL _suppressDowngradeFailure;
BOOL _suppressRepair; BOOL _suppressRepair;
BOOL _modifying; BOOL _modifying;
BOOL _upgrading;
int _crtInstalledToken; int _crtInstalledToken;