[Python-checkins] r67667 - in python/branches/release30-maint: Tools/msi/msi.py Tools/msi/uuids.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Mon Dec  8 20:21:22 2008
New Revision: 67667

Log:
Merged revisions 67661-67662 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r67661 | martin.v.loewis | 2008-12-08 12:19:42 +0100 (Mo, 08 Dez 2008) | 13 lines
  
  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.
  ........
................
  r67662 | martin.v.loewis | 2008-12-08 12:23:22 +0100 (Mo, 08 Dez 2008) | 2 lines
  
  Add UUIDs for 3.0.1 and 3.0.2.
................


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

Modified: python/branches/release30-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release30-maint/Tools/msi/msi.py	(original)
+++ python/branches/release30-maint/Tools/msi/msi.py	Mon Dec  8 20:21:22 2008
@@ -117,6 +117,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)

Modified: python/branches/release30-maint/Tools/msi/uuids.py
==============================================================================
--- python/branches/release30-maint/Tools/msi/uuids.py	(original)
+++ python/branches/release30-maint/Tools/msi/uuids.py	Mon Dec  8 20:21:22 2008
@@ -47,6 +47,9 @@
     '2.6.121': '{bbd34464-ddeb-4028-99e5-f16c4a8fbdb3}', # 2.6c1
     '2.6.122': '{8f64787e-a023-4c60-bfee-25d3a3f592c6}', # 2.6c2
     '2.6.150': '{110eb5c4-e995-4cfb-ab80-a5f315bea9e8}', # 2.6.0
+    '2.6.1150':'{9cc89170-000b-457d-91f1-53691f85b223}', # 2.6.1
+    '2.6.2121':'{adac412b-b209-4c15-b6ab-dca1b6e47144}', # 2.6.2c1
+    '2.6.2150':'{24aab420-4e30-4496-9739-3e216f3de6ae}', # 2.6.2
     '3.0.101': '{8554263a-3242-4857-9359-aa87bc2c58c2}', # 3.0a1
     '3.0.102': '{692d6e2c-f0ac-40b8-a133-7191aeeb67f9}', # 3.0a2
     '3.0.103': '{49cb2995-751a-4753-be7a-d0b1bb585e06}', # 3.0a3
@@ -60,4 +63,8 @@
     '3.0.122': '{f707b8e9-a257-4045-818e-4923fc20fbb6}', # 3.0c2
     '3.0.123': '{5e7208f1-8643-4ea2-ab5e-4644887112e3}', # 3.0c3
     '3.0.150': '{e0e56e21-55de-4f77-a109-1baa72348743}', # 3.0.0
+    '3.1.1121':'{d35b1ea5-3d70-4872-bf7e-cd066a77a9c9}', # 3.0.1c1
+    '3.1.1150':'{de2f2d9c-53e2-40ee-8209-74da63cb060e}', # 3.0.1
+    '3.1.2121':'{cef79e7f-9809-49e2-afd2-e24148d7c855}', # 3.0.2c1
+    '3.1.2150':'{0cf3b95a-8382-4607-9779-c36407ff362c}', # 3.0.2
 }