Merged revisions 73600 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r73600 | martin.v.loewis | 2009-06-28 11:36:14 +0200 (So, 28 Jun 2009) | 10 lines

  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 c8c4f85f92778d3a71ef920780f5677f6d442843..a86c3aa0c6e4a7ee6fe61c077524d8e20e04739f 100644 (file)
--- 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 95c07bc8246b643e22c3693ca2a49976dd8d3239..d6a2048eac7385370a6ac74faf61521cfd00c54c 100644 (file)
--- 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",