[Python-checkins] r73602 - in python/branches/release31-maint: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Jun 28 11:40:34 2009
New Revision: 73602

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Tools/msi/msi.py

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Sun Jun 28 11:40:34 2009
@@ -15,6 +15,12 @@
 Library
 -------
 
+Build
+-----
+
+- Issue 5390: Add uninstall icon independent of whether file
+  extensions are installed.
+
 
 What's New in Python 3.1?
 =========================

Modified: python/branches/release31-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release31-maint/Tools/msi/msi.py	(original)
+++ python/branches/release31-maint/Tools/msi/msi.py	Sun Jun 28 11:40:34 2009
@@ -1258,7 +1258,7 @@
                "", 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",