commit c9d4efdf486d498ba138195796645f201100b699
author Martin v. Löwis <martin@v.loewis.de> Mon Dec 08 11:18:23 2008 +0000
committer Martin v. Löwis <martin@v.loewis.de> Mon Dec 08 11:18:23 2008 +0000
tree f18439f5089bb4aaa3c0ee10838a616d07ff452e
parent 0f5d5caa4f318dfc5685e0ec7de6d5f0176ee86e

Merged revisions 67658-67659 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r67658 | martin.v.loewis | 2008-12-08 12:14:57 +0100 (Mo, 08 Dez 2008) | 1 line

  Add UUIDs for 2.6.1 and 2.6.2.
........
  r67659 | martin.v.loewis | 2008-12-08 12:15:35 +0100 (Mo, 08 Dez 2008) | 1 line

  Consider micro version for name of CHM file.
........

Tools/msi/msi.py

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index a942792..cbeea0d 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -115,6 +115,8 @@
 
 # Compute the name that Sphinx gives to the docfile
 docfile = ""
+if micro:
+    docfile = str(micro)
 if level < 0xf:
     docfile = '%x%s' % (level, serial)
 docfile = 'python%s%s%s.chm' % (major, minor, docfile)