commit b48f63433eca50588597d70cfe140e07e3bc085f
author Benjamin Peterson <benjamin@python.org> Mon Jun 22 19:36:31 2009 +0000
committer Benjamin Peterson <benjamin@python.org> Mon Jun 22 19:36:31 2009 +0000
tree b6c2e3c7a0d845e9861917a4b3e65e0a90436e9b
parent 8be54bb5602235fde8f1516c3c0294f272f6f4a4

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
........

Tools/msi/msi.py

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 @@
 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