[Python-checkins] cpython (merge default -> default): Merge heads

[serhiy.storchaka]

http://hg.python.org/cpython/rev/673ef3f96919
changeset:   84998:673ef3f96919
parent:      84996:4fd48a807812
parent:      84994:7d661f47f73b
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Aug 03 21:17:27 2013 +0300
summary:
  Merge heads

files:
  Misc/NEWS        |  3 +++
  Tools/msi/msi.py |  5 ++++-
  2 files changed, 7 insertions(+), 1 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -765,6 +765,9 @@
 Build
 -----
 
+- Issue #16067: Add description into MSI file to replace installer's 
+  temporary name.
+
 - Issue #18257: Fix readlink usage in python-config.  Install the python
   version again on Darwin.
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1415,7 +1415,10 @@
 # certname (from config.py) should be (a substring of)
 # the certificate subject, e.g. "Python Software Foundation"
 if certname:
-    os.system('signtool sign /n "%s" /t http://timestamp.verisign.com/scripts/timestamp.dll %s' % (certname, msiname))
+    os.system('signtool sign /n "%s" '
+      '/t http://timestamp.verisign.com/scripts/timestamp.dll '
+      '/d "Python %s" '
+      '%s' % (certname, full_current_version, msiname))
 
 if pdbzip:
     build_pdbzip()

-- 
Repository URL: http://hg.python.org/cpython