Merged revisions 73598 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73598 | martin.v.loewis | 2009-06-28 11:32:39 +0200 (So, 28 Jun 2009) | 3 lines

  Issue 5390: Add uninstall icon independent of whether file
  extensions are installed.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 8cbdb19dd9ac7b65d486f6135443c56524bc5084..c1ffebe6ca5c72f107c89c488cb9bcd6818363cf 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,9 @@ Extension Modules
 Build
 -----
 
+- Issue 5390: Add uninstall icon independent of whether file
+  extensions are installed.
+
 - Issue #6094: Build correctly with Subversion 1.7.
 
 - Issue #5726: Make Modules/ld_so_aix return the actual exit code of the

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a5664d8c880486b672ba336f310bb54b11683b0c..ef36e367ca3fe2fcd875a971e96222b603197983 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1254,7 +1254,7 @@ def add_registry(db):
                "", r"[TARGETDIR]Python.exe", "REGISTRY.def"),
               ("DisplayIcon", -1,
                r"Software\Microsoft\Windows\CurrentVersion\Uninstall\%s" % product_code,
-               "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY.def")
+               "DisplayIcon", "[TARGETDIR]python.exe", "REGISTRY")
               ])
     # Shortcuts, see "Shortcut Table"
     add_data(db, "Directory",