From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 28 Jun 2009 09:35:10 +0000 (+0000)
Subject: Merged revisions 73598 via svnmerge from
X-Git-Tag: v2.6.3rc1~184
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=230d2a2075e67b0b944c454187846ebc106e9a02;p=thirdparty%2FPython%2Fcpython.git

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 8cbdb19dd9ac..c1ffebe6ca5c 100644
--- 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 a5664d8c8804..ef36e367ca3f 100644
--- 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",