summaryrefslogtreecommitdiff
path: root/Tools/msi
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-06-28 12:29:40 +0000
committerMartin v. Löwis <martin@v.loewis.de>2009-06-28 12:29:40 +0000
commitef27fcc0efac75584305292ce24939e0cb537161 (patch)
tree11875c1771cf4704e2b9c7dd03633d62348c4e0e /Tools/msi
parentf3cf423a36c1b5ca3a3d7ad57879f1d5996d8719 (diff)
downloadcpython-ef27fcc0efac75584305292ce24939e0cb537161.tar.gz
Merged revisions 73607 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r73607 | martin.v.loewis | 2009-06-28 14:28:29 +0200 (So, 28 Jun 2009) | 9 lines Merged revisions 73606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73606 | martin.v.loewis | 2009-06-28 14:24:23 +0200 (So, 28 Jun 2009) | 2 lines Fix types in logic to compute help file name. ........ ................
Diffstat (limited to 'Tools/msi')
-rw-r--r--Tools/msi/msi.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d6a2048eac..cd67e996c0 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -117,13 +117,13 @@ pythondll_uuid = {
# Compute the name that Sphinx gives to the docfile
docfile = ""
-if micro:
- docfile = str(micro)
+if int(micro):
+ docfile = micro
if level < 0xf:
if level == 0xC:
- docfile = "rc%s" % (serial,)
+ docfile += "rc%s" % (serial,)
else:
- docfile = '%x%s' % (level, serial)
+ docfile += '%x%s' % (level, serial)
docfile = 'python%s%s%s.chm' % (major, minor, docfile)
# Build the mingw import library, libpythonXY.a