diff options
| author | Christian Heimes <christian@cheimes.de> | 2007-12-04 15:00:33 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2007-12-04 15:00:33 (GMT) |
| commit | d0764e2bd15d5900b73ec3d4b54fb2b45a3006f0 (patch) | |
| tree | aa42b5908aff75417b4d687973e352e6b74502ea /Tools | |
| parent | de10c85314b1f351b4d75414c55175c00a921175 (diff) | |
| download | cpython-d0764e2bd15d5900b73ec3d4b54fb2b45a3006f0.zip cpython-d0764e2bd15d5900b73ec3d4b54fb2b45a3006f0.tar.gz cpython-d0764e2bd15d5900b73ec3d4b54fb2b45a3006f0.tar.bz2 | |
Merged revisions 59313-59320 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59317 | martin.v.loewis | 2007-12-04 09:37:59 +0100 (Tue, 04 Dec 2007) | 2 lines
Fix chflags issue on Tru64, from #1490190.
........
r59318 | martin.v.loewis | 2007-12-04 09:39:16 +0100 (Tue, 04 Dec 2007) | 2 lines
Move nt.access change into the right section.
........
r59320 | christian.heimes | 2007-12-04 15:57:30 +0100 (Tue, 04 Dec 2007) | 2 lines
Added self generated UUID for msvcr90.dll to msi.py
Readded a missing line.
........
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/msi/msi.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index 718d69e..c8b4bf6 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -106,8 +106,9 @@ extensions = [ # from 1 to 2 (due to what I consider a bug in MSI) # Using the same UUID is fine since these files are versioned, # so Installer will always keep the newest version. +# NOTE: All uuids are self generated. msvcr71_uuid = "{8666C8DD-D0B4-4B42-928E-A69E32FA5D4D}" -msvcr90_uuid = "" # XXX +msvcr90_uuid = "{9C28CD84-397C-4045-855C-28B02291A272}" pythondll_uuid = { "24":"{9B81E618-2301-4035-AC77-75D9ABEB7301}", "25":"{2e41b118-38bd-4c1b-a840-6977efd1b911}", @@ -824,7 +825,8 @@ def extract_msvcr71(): dir = _winreg.QueryValueEx(k, "MSMDir")[0] _winreg.CloseKey(k) files = glob.glob1(dir, "*CRT71*") - assert len(files) > 0, (dir, files) + assert len(files) == 1, (dir, files) + file = os.path.join(dir, files[0]) # Extract msvcr71.dll m = msilib.MakeMerge2() m.OpenModule(file, 0) |