[Python-checkins] cpython: Fix installer Back button going to wrong page when modifying.

Thu Feb 12 02:49:25 CET 2015

https://hg.python.org/cpython/rev/4828cb77bf2a
changeset: 94593:4828cb77bf2a
user: Steve Dower <steve.dower at microsoft.com>
date: Wed Feb 11 17:49:01 2015 -0800
summary:
 Fix installer Back button going to wrong page when modifying.
Also fix error when doing test builds without documentation file.
files:
 Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 9 ++++++++-
 Tools/msi/doc/doc.wxs | 2 ++
 2 files changed, 10 insertions(+), 1 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
@@ -325,7 +325,11 @@
 
 case ID_CUSTOM1_BACK_BUTTON:
 SavePageSettings();
- GoToPage(PAGE_INSTALL);
+ if (_modifying) {
+ GoToPage(PAGE_MODIFY);
+ } else {
+ GoToPage(PAGE_INSTALL);
+ }
 break;
 
 case ID_INSTALL_CUSTOM_BUTTON: __fallthrough;
@@ -412,6 +416,7 @@
 _engine->SetVariableString(L"InstallAllUsersState", L"disable");
 _engine->SetVariableString(L"TargetDirState", L"disable");
 _engine->SetVariableString(L"CustomBrowseButtonState", L"disable");
+ _modifying = TRUE;
 GoToPage(PAGE_CUSTOM1);
 break;
 
@@ -2518,6 +2523,7 @@
 
 _suppressDowngradeFailure = FALSE;
 _suppressRepair = FALSE;
+ _modifying = FALSE;
 
 _overridableVariables = nullptr;
 _taskbarList = nullptr;
@@ -2598,6 +2604,7 @@
 
 BOOL _suppressDowngradeFailure;
 BOOL _suppressRepair;
+ BOOL _modifying;
 
 STRINGDICT_HANDLE _overridableVariables;
 
diff --git a/Tools/msi/doc/doc.wxs b/Tools/msi/doc/doc.wxs
--- a/Tools/msi/doc/doc.wxs
+++ b/Tools/msi/doc/doc.wxs
@@ -10,6 +10,7 @@
 <Feature Id="DefaultFeature" AllowAdvertise="no" Title="!(loc.Title)" Description="!(loc.Description)">
 <ComponentGroupRef Id="doc" />
 
+ <?ifdef DocFilename ?>
 <Component Id="doc_shortcut" Directory="MenuDir" Guid="*">
 <RegistryKey Root="HKMU" Key="[REGISTRYKEY]">
 <RegistryValue Key="Help\Main Python Documentation" Type="string" Value="[#python.chm]" KeyPath="yes" />
@@ -20,6 +21,7 @@
 Description="!(loc.ShortcutDescription)" />
 <RemoveFolder Id="Remove_MenuDir" On="uninstall" />
 </Component>
+ <?endif ?>
 
 </Feature>
 </Product>
-- 
Repository URL: https://hg.python.org/cpython
