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

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d6a2048eac7385370a6ac74faf61521cfd00c54c..cd67e996c076cb54f52fc987cbe69b46e7fd9495 100644 (file)
--- 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