summaryrefslogtreecommitdiffstats
path: root/Tools/msi
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2009-06-28 12:28:29 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2009-06-28 12:28:29 (GMT)
commitdb7b5704beda081d93bdfb17c52ce5d3dbdb56cc (patch)
tree71279df2341f1057538a5112208a05e80014f26e /Tools/msi
parent892a37aff15e85a02492955e9281127cf20afbaf (diff)
downloadcpython-db7b5704beda081d93bdfb17c52ce5d3dbdb56cc.zip
cpython-db7b5704beda081d93bdfb17c52ce5d3dbdb56cc.tar.gz
cpython-db7b5704beda081d93bdfb17c52ce5d3dbdb56cc.tar.bz2
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 d6a2048..cd67e99 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