[Python-3000-checkins] r66883 - in python/branches/py3k: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Oct 13 13:30:30 2008
New Revision: 66883

Log:
Merged revisions 66881 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Misc/NEWS
python/branches/py3k/Tools/msi/msi.py

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Mon Oct 13 13:30:30 2008
@@ -58,6 +58,11 @@

- Issue #3659: Subclasses of str didn't work as SQL parameters.

+Build
+-----
+
+- Issue #4018: Disable "for me" installations on Vista.
+

What's New in Python 3.0 release candidate 1
============================================

Modified: python/branches/py3k/Tools/msi/msi.py
==============================================================================
--- python/branches/py3k/Tools/msi/msi.py (original)
+++ python/branches/py3k/Tools/msi/msi.py Mon Oct 13 13:30:30 2008
@@ -218,7 +218,8 @@
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 @@
"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)