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
76b7133f
Commit
76b7133f
authored
Sep 11, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #25071: Windows installer should not require TargetDir parameter when installing quietly
parent
0db1c42c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
35 additions
and
0 deletions
+35
-0
Misc/NEWS
Misc/NEWS
+5
-0
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+30
-0
No files found.
Misc/NEWS
View file @
76b7133f
...
...
@@ -7,6 +7,11 @@ What's New in Python 3.5.0 final?
Release date: 2015-09-13
Build
-----
- Issue #25071: Windows installer should not require TargetDir
parameter when installing quietly
What'
s
New
in
Python
3.5.0
release
candidate
4
?
===============================================
...
...
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file @
76b7133f
...
...
@@ -723,6 +723,36 @@ public: // IBootstrapperApplication
hrStatus
=
EvaluateConditions
();
}
if
(
SUCCEEDED
(
hrStatus
))
{
// Ensure the default path has been set
LONGLONG
installAll
;
LPWSTR
targetDir
=
nullptr
;
LPWSTR
defaultTargetDir
=
nullptr
;
hrStatus
=
BalGetStringVariable
(
L"TargetDir"
,
&
targetDir
);
if
(
FAILED
(
hrStatus
)
||
!
targetDir
||
!
targetDir
[
0
])
{
ReleaseStr
(
targetDir
);
targetDir
=
nullptr
;
if
(
FAILED
(
BalGetNumericVariable
(
L"InstallAllUsers"
,
&
installAll
)))
{
installAll
=
0
;
}
hrStatus
=
BalGetStringVariable
(
installAll
?
L"DefaultAllUsersTargetDir"
:
L"DefaultJustForMeTargetDir"
,
&
defaultTargetDir
);
if
(
SUCCEEDED
(
hrStatus
)
&&
defaultTargetDir
)
{
if
(
defaultTargetDir
[
0
]
&&
SUCCEEDED
(
BalFormatString
(
defaultTargetDir
,
&
targetDir
)))
{
hrStatus
=
_engine
->
SetVariableString
(
L"TargetDir"
,
targetDir
);
ReleaseStr
(
targetDir
);
}
ReleaseStr
(
defaultTargetDir
);
}
}
}
SetState
(
PYBA_STATE_DETECTED
,
hrStatus
);
// If we're not interacting with the user or we're doing a layout or we're just after a force restart
...
...
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