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

[serhiy.storchaka]

http://hg.python.org/cpython/rev/6793ce8e803d
changeset:   84997:6793ce8e803d
branch:      3.3
parent:      84995:ecc8512b427d
parent:      84993:797b1d13d16e
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Sat Aug 03 21:17:04 2013 +0300
summary:
  Merge heads

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


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -306,6 +306,8 @@
 Build
 -----
 
+- Issue #16067: Add description into MSI file to replace installer's temporary name.
+
 - Issue #18256: Compilation fix for recent AIX releases.  Patch by
   David Edelsohn.
 
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1410,7 +1410,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