[Python-checkins] cpython: Missing brace and minor formatting in Windows installer

Wed Mar 25 07:47:06 CET 2015

https://hg.python.org/cpython/rev/efa27c8133ec
changeset: 95199:efa27c8133ec
user: Steve Dower <steve.dower at microsoft.com>
date: Tue Mar 24 23:46:55 2015 -0700
summary:
 Missing brace and minor formatting in Windows installer
files:
 Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp | 4 ++--
 1 files changed, 2 insertions(+), 2 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
@@ -707,8 +707,7 @@
 HRESULT hr = S_OK;
 BAL_INFO_PACKAGE* pPackage = nullptr;
 
- if (_nextPackageAfterRestart) // after force restart, skip packages until after the package that caused the restart.
- {
+ if (_nextPackageAfterRestart) {
 // After restart we need to finish the dependency registration for our package so allow the package
 // to go present.
 if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, _nextPackageAfterRestart, -1)) {
@@ -723,6 +722,7 @@
 BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Skipping package: %ls, after restart because it was applied before the restart.", wzPackageId);
 
 *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE;
+ }
 } else if ((_plannedAction == BOOTSTRAPPER_ACTION_INSTALL || _plannedAction == BOOTSTRAPPER_ACTION_MODIFY) &&
 SUCCEEDED(BalInfoFindPackageById(&_bundle.packages, wzPackageId, &pPackage))) {
 BOOL f = FALSE;
-- 
Repository URL: https://hg.python.org/cpython
