summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-11-30 11:12:00 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-11-30 11:12:00 (GMT)
commit45a6b9f7e57b96d7489a61a2ca41dd60fa3f6c0a (patch)
tree2104b0ea00aaaad4f12c09c3df2a3be8b2ea65d4
parent841edad43ceb903dbbc3b5f4621ec0628d2ca8dc (diff)
downloadcpython-45a6b9f7e57b96d7489a61a2ca41dd60fa3f6c0a.zip
cpython-45a6b9f7e57b96d7489a61a2ca41dd60fa3f6c0a.tar.gz
cpython-45a6b9f7e57b96d7489a61a2ca41dd60fa3f6c0a.tar.bz2
Merged revisions 67449 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67449 | martin.v.loewis | 2008-11-30 12:08:26 +0100 (So, 30 Nov 2008) | 3 lines Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs". ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Tools/msi/msi.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d802692..4872be2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -115,6 +115,8 @@ Library
Build
-----
+- Issue #4389: Add icon to the uninstall entry in "add-and-remove-programs".
+
- Issue #4289: Remove Cancel button from AdvancedDlg.
- Issue #1656675: Register a drop handler for .py* files on Windows.
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 4b1e3d9..9579935 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1249,7 +1249,10 @@ def add_registry(db):
"[TARGETDIR]Doc\\"+docfile , "REGISTRY.doc"),
("Modules", -1, prefix+r"\Modules", "+", None, "REGISTRY"),
("AppPaths", -1, r"Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe",
- "", r"[TARGETDIR]Python.exe", "REGISTRY.def")
+ "", r"[TARGETDIR]Python.exe", "REGISTRY.def"),
+ ("DisplayIcon", -1,
+ r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % product_code,
+ "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY.def")
])
# Shortcuts, see "Shortcut Table"
add_data(db, "Directory",