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

diff --git a/Misc/NEWS b/Misc/NEWS
index d80269277c709869e5db6c707b84b883da561ab9..4872be23a04633404f86e0525fb7580d53cb8223 100644 (file)
--- 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 4b1e3d9155c81025debad7de22b6a8633d28f11e..9579935b4675c3cd00f48d919e094ac8e353d78e 100644 (file)
--- 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",