summaryrefslogtreecommitdiffstats
path: root/Tools/msi/msi.py
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-12-08 11:19:42 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-12-08 11:19:42 (GMT)
commita116cf0c6f58224bc31578a5024942a242014c35 (patch)
tree86e07360e79929aa887380c981d51a65da0153ba /Tools/msi/msi.py
parent05b482caf89fe8b1f678dafaebef1030486a87b2 (diff)
downloadcpython-a116cf0c6f58224bc31578a5024942a242014c35.zip
cpython-a116cf0c6f58224bc31578a5024942a242014c35.tar.gz
cpython-a116cf0c6f58224bc31578a5024942a242014c35.tar.bz2
Merged revisions 67658-67659 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r67658 | martin.v.loewis | 2008-12-08 12:14:57 +0100 (Mo, 08 Dez 2008) | 1 line Add UUIDs for 2.6.1 and 2.6.2. ........ r67659 | martin.v.loewis | 2008-12-08 12:15:35 +0100 (Mo, 08 Dez 2008) | 1 line Consider micro version for name of CHM file. ........
Diffstat (limited to 'Tools/msi/msi.py')
-rw-r--r--Tools/msi/msi.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 9579935..bf24316 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -117,6 +117,8 @@ pythondll_uuid = {
# Compute the name that Sphinx gives to the docfile
docfile = ""
+if micro:
+ docfile = str(micro)
if level < 0xf:
docfile = '%x%s' % (level, serial)
docfile = 'python%s%s%s.chm' % (major, minor, docfile)