summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-08-03 18:17:27 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-08-03 18:17:27 (GMT)
commit616c44188d270d48e7ac49d8c4ec5d3c443f00bb (patch)
tree066147ecb855b12609c5684442e554b4923338fa
parent579ddc2fd4fd618b72d8202d79d75d22e7e0b60a (diff)
parentd87c3d3ea4806db4e230f3bbd9791617aef62298 (diff)
downloadcpython-616c44188d270d48e7ac49d8c4ec5d3c443f00bb.zip
cpython-616c44188d270d48e7ac49d8c4ec5d3c443f00bb.tar.gz
cpython-616c44188d270d48e7ac49d8c4ec5d3c443f00bb.tar.bz2
Merge heads
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py5
2 files changed, 7 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 61857a9..92602e1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -765,6 +765,9 @@ Windows
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
index 3e3cef1..73f1c83 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1415,7 +1415,10 @@ merge(msiname, "SharedCRT", "TARGETDIR", modules)
# 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()