Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
48919976
Commit
48919976
authored
Mar 24, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Missing brace and minor formatting in Windows installer
parent
2ea51c98
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+2
-2
No files found.
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file @
48919976
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment