summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-10-13 11:23:35 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-10-13 11:23:35 (GMT)
commiteba774b486940a790e484778e30ac7ccbb398e15 (patch)
tree89f3ce8d7bfb41e19aed914a1f278f75b508294b
parent76f71a52d76b45ab177fcbd960c167e877ac5066 (diff)
downloadcpython-eba774b486940a790e484778e30ac7ccbb398e15.zip
cpython-eba774b486940a790e484778e30ac7ccbb398e15.tar.gz
cpython-eba774b486940a790e484778e30ac7ccbb398e15.tar.bz2
Issue #4018: Disable "for me" installations on Vista.
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index dc191d6..3cfdc06 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Library
Build
-----
+- Issue #4018: Disable "for me" installations on Vista.
+
- Issue #3758: Add ``patchcheck`` build target to .PHONY.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 285cb9f..707786e 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -217,7 +217,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
@@ -697,10 +698,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)