summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-06-28 09:35:10 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-06-28 09:35:10 (GMT)
commit230d2a2075e67b0b944c454187846ebc106e9a02 (patch)
treea70999b7f1bc84804b3becdeff8558e16ce5cf6b
parent4d865a7d17a6328cb60bd916c2f43972e71b01b8 (diff)
downloadcpython-230d2a2075e67b0b944c454187846ebc106e9a02.zip
cpython-230d2a2075e67b0b944c454187846ebc106e9a02.tar.gz
cpython-230d2a2075e67b0b944c454187846ebc106e9a02.tar.bz2
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. ........
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 8cbdb19..c1ffebe 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -139,6 +139,9 @@ Extension Modules
Build
-----
+- Issue 5390: Add uninstall icon independent of whether file
+ extensions are installed.
+
- Issue #6094: Build correctly with Subversion 1.7.
- Issue #5726: Make Modules/ld_so_aix return the actual exit code of the
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a5664d8..ef36e36 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1254,7 +1254,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",