From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 28 Jun 2009 09:36:14 +0000 (+0000)
Subject: Merged revisions 73598 via svnmerge from
X-Git-Tag: v3.2a1~2982
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95c460187043204823d11dbe2d06dae823d024dd;p=python

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 b4b9e9ff29..2f5e7b9a5b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,12 @@ Core and Builtins
 Library
 -------
 
+Build
+-----
+
+- Issue 5390: Add uninstall icon independent of whether file
+  extensions are installed.
+
 
 What's New in Python 3.1?
 =========================
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 95c07bc824..d6a2048eac 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1258,7 +1258,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",