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
7850541a
Commit
7850541a
authored
Feb 22, 2014
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #20641: Run custom actions with the NoImpersonate flag to support UAC.
parent
9d4c5f46
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
11 deletions
+12
-11
Misc/NEWS
Misc/NEWS
+3
-0
Tools/msi/msi.py
Tools/msi/msi.py
+9
-11
No files found.
Misc/NEWS
View file @
7850541a
...
...
@@ -71,6 +71,9 @@ Library
Build
-----
-
Issue
#
20641
:
Run
MSI
custom
actions
(
pip
installation
,
pyc
compilation
)
with
the
NoImpersonate
flag
,
to
support
elevated
execution
(
UAC
).
-
Issue
#
20221
:
Removed
conflicting
(
or
circular
)
hypot
definition
when
compiled
with
VS
2010
or
above
.
Initial
patch
by
Tabrez
Mohammed
.
...
...
Tools/msi/msi.py
View file @
7850541a
...
...
@@ -435,12 +435,13 @@ def add_ui(db):
(
"SetLauncherDirToWindows"
,
307
,
"LAUNCHERDIR"
,
"[WindowsFolder]"
),
# msidbCustomActionTypeExe + msidbCustomActionTypeSourceFile
# See "Custom Action Type 18"
(
"CompilePyc"
,
18
,
"python.exe"
,
compileargs
),
(
"CompilePyo"
,
18
,
"python.exe"
,
"-O "
+
compileargs
),
(
"CompileGrammar"
,
18
,
"python.exe"
,
lib2to3args
),
# msidbCustomActionTypeInScript (1024); run during actual installation
(
"UpdatePip"
,
18
+
1024
,
"python.exe"
,
updatepipargs
),
(
"RemovePip"
,
18
,
"python.exe"
,
removepipargs
),
# msidbCustomActionTypeNoImpersonate (2048); run action in system account, not user account
(
"CompilePyc"
,
18
+
1024
+
2048
,
"python.exe"
,
compileargs
),
(
"CompilePyo"
,
18
+
1024
+
2048
,
"python.exe"
,
"-O "
+
compileargs
),
(
"CompileGrammar"
,
18
+
1024
+
2048
,
"python.exe"
,
lib2to3args
),
(
"UpdatePip"
,
18
+
1024
+
2048
,
"python.exe"
,
updatepipargs
),
(
"RemovePip"
,
18
+
1024
+
2048
,
"python.exe"
,
removepipargs
),
])
# UI Sequences, see "InstallUISequence Table", "Using a Sequence Table"
...
...
@@ -483,17 +484,14 @@ def add_ui(db):
# remove pip when state changes to INSTALLSTATE_ABSENT
# run before RemoveFiles
(
"RemovePip"
,
"&pip_feature=2"
,
3499
),
(
"CompilePyc"
,
"COMPILEALL"
,
6800
),
(
"CompilePyo"
,
"COMPILEALL"
,
6801
),
(
"CompileGrammar"
,
"COMPILEALL"
,
6802
),
(
"CompilePyc"
,
"COMPILEALL"
,
4002
),
(
"CompilePyo"
,
"COMPILEALL"
,
4003
),
(
"CompileGrammar"
,
"COMPILEALL"
,
4004
),
])
add_data
(
db
,
"AdminExecuteSequence"
,
[(
"InitialTargetDir"
,
'TARGETDIR=""'
,
750
),
(
"SetDLLDirToTarget"
,
'DLLDIR=""'
,
751
),
(
"SetLauncherDirToTarget"
,
'LAUNCHERDIR=""'
,
752
),
(
"CompilePyc"
,
"COMPILEALL"
,
6800
),
(
"CompilePyo"
,
"COMPILEALL"
,
6801
),
(
"CompileGrammar"
,
"COMPILEALL"
,
6802
),
])
#####################################################################
...
...
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