summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-06-22 19:36:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-06-22 19:36:31 (GMT)
commitb48f63433eca50588597d70cfe140e07e3bc085f (patch)
treeb6c2e3c7a0d845e9861917a4b3e65e0a90436e9b /Tools
parent8be54bb5602235fde8f1516c3c0294f272f6f4a4 (diff)
downloadcpython-b48f63433eca50588597d70cfe140e07e3bc085f.zip
cpython-b48f63433eca50588597d70cfe140e07e3bc085f.tar.gz
cpython-b48f63433eca50588597d70cfe140e07e3bc085f.tar.bz2
Merged revisions 73415,73417-73418 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73415 | benjamin.peterson | 2009-06-13 09:25:08 -0500 (Sat, 13 Jun 2009) | 1 line use 'rc' for release candidates for consistency ........ r73417 | benjamin.peterson | 2009-06-13 10:42:23 -0500 (Sat, 13 Jun 2009) | 1 line special case release candidates ........ r73418 | benjamin.peterson | 2009-06-13 10:48:04 -0500 (Sat, 13 Jun 2009) | 1 line handle different rc format ........
Diffstat (limited to 'Tools')
-rw-r--r--Tools/msi/msi.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 986852a..95c07bc 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -120,7 +120,10 @@ docfile = ""
if micro:
docfile = str(micro)
if level < 0xf:
- docfile = '%x%s' % (level, serial)
+ if level == 0xC:
+ docfile = "rc%s" % (serial,)
+ else:
+ docfile = '%x%s' % (level, serial)
docfile = 'python%s%s%s.chm' % (major, minor, docfile)
# Build the mingw import library, libpythonXY.a