summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msi.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-10-13 11:30:30 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-10-13 11:30:30 (GMT)
commitf63921f9d00bb5dd4a2ec0f95e8f395fc0aa58f4 (patch)
tree5afd5909c01a41bdefc69c967c5526a5a5af8157 /Tools/msi/msi.py
parent1c9313f7db801eea125ccf1c592947f347b1aa42 (diff)
downloadcpython-f63921f9d00bb5dd4a2ec0f95e8f395fc0aa58f4.zip
cpython-f63921f9d00bb5dd4a2ec0f95e8f395fc0aa58f4.tar.gz
cpython-f63921f9d00bb5dd4a2ec0f95e8f395fc0aa58f4.tar.bz2
Merged revisions 66881 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r66881 | martin.v.loewis | 2008-10-13 13:23:35 +0200 (Mo, 13 Okt 2008) | 2 lines Issue #4018: Disable "for me" installations on Vista. ........
Diffstat (limited to 'Tools/msi/msi.py')
-rw-r--r--Tools/msi/msi.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 92b8dcc..022067c 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -218,7 +218,8 @@ def build_database():
schema, ProductName="Python "+full_current_version+productsuffix,
ProductCode=product_code,
ProductVersion=current_version,
- Manufacturer=u"Python Software Foundation")
+ Manufacturer=u"Python Software Foundation",
+ request_uac = True)
# The default sequencing of the RemoveExistingProducts action causes
# removal of files that got just installed. Place it after
# InstallInitialize, so we first uninstall everything, but still roll
@@ -698,10 +699,11 @@ def add_ui(db):
"AdminInstall", "Next", "Cancel")
whichusers.title("Select whether to install [ProductName] for all users of this computer.")
# A radio group with two options: allusers, justme
- g = whichusers.radiogroup("AdminInstall", 135, 60, 160, 50, 3,
+ g = whichusers.radiogroup("AdminInstall", 135, 60, 235, 80, 3,
"WhichUsers", "", "Next")
+ g.condition("Disable", "VersionNT=600") # Not available on Vista and Windows 2008
g.add("ALL", 0, 5, 150, 20, "Install for all users")
- g.add("JUSTME", 0, 25, 150, 20, "Install just for me")
+ g.add("JUSTME", 0, 25, 235, 20, "Install just for me (not available on Windows Vista)")
whichusers.back("Back", None, active=0)