[Python-checkins] r73608 - in python/branches/release31-maint: Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Jun 28 14:29:40 2009
New Revision: 73608

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


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Tools/msi/msi.py

Modified: python/branches/release31-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release31-maint/Tools/msi/msi.py	(original)
+++ python/branches/release31-maint/Tools/msi/msi.py	Sun Jun 28 14:29:40 2009
@@ -117,13 +117,13 @@
 
 # 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