1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Missing brace and minor formatting in Windows installer

Browse Source
This commit is contained in:
Steve Dower 2015-03-24 23:46:55 -07:00
parent 2ea51c98db
commit 489199765f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View File

@ -707,8 +707,7 @@ public: // IBootstrapperApplication
HRESULT hr = S_OK; HRESULT hr = S_OK;
BAL_INFO_PACKAGE* pPackage = nullptr; 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 // After restart we need to finish the dependency registration for our package so allow the package
// to go present. // to go present.
if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, _nextPackageAfterRestart, -1)) { 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); BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Skipping package: %ls, after restart because it was applied before the restart.", wzPackageId);
*pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE;
}
} else if ((_plannedAction == BOOTSTRAPPER_ACTION_INSTALL || _plannedAction == BOOTSTRAPPER_ACTION_MODIFY) && } else if ((_plannedAction == BOOTSTRAPPER_ACTION_INSTALL || _plannedAction == BOOTSTRAPPER_ACTION_MODIFY) &&
SUCCEEDED(BalInfoFindPackageById(&_bundle.packages, wzPackageId, &pPackage))) { SUCCEEDED(BalInfoFindPackageById(&_bundle.packages, wzPackageId, &pPackage))) {
BOOL f = FALSE; BOOL f = FALSE;