diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2009-06-28 12:29:40 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2009-06-28 12:29:40 (GMT) |
| commit | a01bd62f481336c1a874eebd3e93143aa17cf3c7 (patch) | |
| tree | 7072407ae426c24ff2a339af78314dbc7f2f0dea /Tools/msi | |
| parent | 9d49c1d1867b7ad6f146fa4b21450154ac77ef96 (diff) | |
| download | cpython-a01bd62f481336c1a874eebd3e93143aa17cf3c7.zip cpython-a01bd62f481336c1a874eebd3e93143aa17cf3c7.tar.gz cpython-a01bd62f481336c1a874eebd3e93143aa17cf3c7.tar.bz2 | |
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.py | 8 |
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 |