Skip to content

Commit c9d4efd

Browse files
committed
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. ........
1 parent 0f5d5ca commit c9d4efd

2 files changed

Lines changed: 5 additions & 0 deletions

File tree

Tools/msi/msi.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@
115115

116116
# Compute the name that Sphinx gives to the docfile
117117
docfile = ""
118+
if micro:
119+
docfile = str(micro)
118120
if level < 0xf:
119121
docfile = '%x%s' % (level, serial)
120122
docfile = 'python%s%s%s.chm' % (major, minor, docfile)

Tools/msi/uuids.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,7 @@
4747
'2.6.121': '{bbd34464-ddeb-4028-99e5-f16c4a8fbdb3}', # 2.6c1
4848
'2.6.122': '{8f64787e-a023-4c60-bfee-25d3a3f592c6}', # 2.6c2
4949
'2.6.150': '{110eb5c4-e995-4cfb-ab80-a5f315bea9e8}', # 2.6.0
50+
'2.6.1150':'{9cc89170-000b-457d-91f1-53691f85b223}', # 2.6.1
51+
'2.6.2121':'{adac412b-b209-4c15-b6ab-dca1b6e47144}', # 2.6.2c1
52+
'2.6.2150':'{24aab420-4e30-4496-9739-3e216f3de6ae}', # 2.6.2
5053
}

0 commit comments

Comments
 (0)