[Python-checkins] cpython (3.5): Issue #25081: Makes Back button in installer go back to upgrade page when
steve.dower
python-checkins at python.org
Wed Sep 23 02:01:57 CEST 2015
https://hg.python.org/cpython/rev/94ea3e05817f
changeset: 98178:94ea3e05817f
branch: 3.5
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Sep 22 16:36:33 2015 -0700
summary:
Issue #25081: Makes Back button in installer go back to upgrade page when upgrading.
files:
Misc/NEWS | 3 +++
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 5 +++++
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -150,6 +150,9 @@
Windows
-------
+- Issue #25081: Makes Back button in installer go back to upgrade page when
+ upgrading.
+
- Issue #25091: Increases font size of the installer.
- Issue #25126: Clarifies that the non-web installer will download some
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
@@ -323,6 +323,8 @@
SavePageSettings();
if (_modifying) {
GoToPage(PAGE_MODIFY);
+ } else if (_upgrading) {
+ GoToPage(PAGE_UPGRADE);
} else {
GoToPage(PAGE_INSTALL);
}
@@ -2524,6 +2526,7 @@
case BOOTSTRAPPER_ACTION_INSTALL:
if (_upgradingOldVersion) {
_installPage = PAGE_UPGRADE;
+ _upgrading = TRUE;
} else if (SUCCEEDED(BalGetNumericVariable(L"SimpleInstall", &simple)) && simple) {
_installPage = PAGE_SIMPLE_INSTALL;
} else {
@@ -3029,6 +3032,7 @@
_suppressDowngradeFailure = FALSE;
_suppressRepair = FALSE;
_modifying = FALSE;
+ _upgrading = FALSE;
_overridableVariables = nullptr;
_taskbarList = nullptr;
@@ -3113,6 +3117,7 @@
BOOL _suppressDowngradeFailure;
BOOL _suppressRepair;
BOOL _modifying;
+ BOOL _upgrading;
int _crtInstalledToken;
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list