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.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 90540d0913a3bce75b43389bb5ae553071232ac9..f0bcb70f2b2a35f5f600c9fcdafe0098ea1cb4ea 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -33,6 +33,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 bb74d53284c1988f368611a0d318c48ddbe41f86..e2ff6c17e9dd66b34ad1e3e43d353b3900ddfb19 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -216,7 +216,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
@@ -696,10 +697,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)