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

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 9579935b4675c3cd00f48d919e094ac8e353d78e..bf2431687c8cecee2fad2f56e39c59d11c29feae 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -117,6 +117,8 @@ pythondll_uuid = {
 
 # 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)

diff --git a/Tools/msi/uuids.py b/Tools/msi/uuids.py
index a6dafc5a24c3554f7305084ad69b22da8e4a2a01..f2eaab47d95e5da9f30658642861474d1034eaa7 100644 (file)
--- a/Tools/msi/uuids.py
+++ b/Tools/msi/uuids.py
@@ -47,6 +47,9 @@ product_codes = {
     '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