From 1ee5864ad3024a515e8a1adb576ad3adc3bb7284 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Sun, 28 Jun 2009 09:39:22 +0000 Subject: [PATCH] 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. ........ ................ --- Misc/NEWS | 3 +++ Tools/msi/msi.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index d121d55fa730..c9aaaf4826e3 100644 --- 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 ba43568b4f0a..f2d613b34727 100644 --- 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", -- 2.47.3