From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 28 Jun 2009 09:40:34 +0000 (+0000)
Subject: Merged revisions 73600 via svnmerge from
X-Git-Tag: v3.1.1rc1~135
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9d49c1d1867b7ad6f146fa4b21450154ac77ef96;p=thirdparty%2FPython%2Fcpython.git

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 c8c4f85f9277..a86c3aa0c6e4 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 95c07bc8246b..d6a2048eac73 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",