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 d121d55fa730fd37a50b8a82581ddbe11f715050..c9aaaf4826e33af1f364b1a6881509580f2da088 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -209,6 +209,9 @@ Extension Modules
 Build
 -----
 
+- Issue 5390: Add uninstall icon independent of whether file
+  extensions are installed.
+
 - Issue #6094: Build correctly with Subversion 1.7.
 
 - Link the shared python library with $(MODLIBS).

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index ba43568b4f0a7f2bb97452c09efceeb86d65962c..f2d613b34727a374a3411a542b8faa2652cf88e6 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1256,7 +1256,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",