diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2015-03-25 06:46:55 (GMT) |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2015-03-25 06:46:55 (GMT) |
| commit | 489199765ff313d0a7dad70b8fbf416667c43862 (patch) | |
| tree | 3a3eb813f1cb42d2bda72c73aa7d8f480a5282c2 /Tools | |
| parent | 2ea51c98db217498039e3d36650cd4a1c977d734 (diff) | |
| download | cpython-489199765ff313d0a7dad70b8fbf416667c43862.zip cpython-489199765ff313d0a7dad70b8fbf416667c43862.tar.gz cpython-489199765ff313d0a7dad70b8fbf416667c43862.tar.bz2 | |
Missing brace and minor formatting in Windows installer
Diffstat (limited to 'Tools')
| -rw-r--r-- | 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 index 87ec6f2..bc40846 100644 --- a/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp +++ b/Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp @@ -707,8 +707,7 @@ public: // IBootstrapperApplication 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 @@ public: // IBootstrapperApplication 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; |