From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 19 Nov 2007 06:46:55 +0000 (+0000)
Subject: Revert modifications to extract_msvcr71 in 59040,
X-Git-Tag: v3.0a2~155
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6b46357f652e620a4072ced75abd664be632210;p=thirdparty%2FPython%2Fcpython.git

Revert modifications to extract_msvcr71 in 59040,
as they didn't actually work.
---

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index 42cb3fd6f878..dffd02e38364 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -823,15 +823,13 @@ def extract_msvcr71():
         r"Software\Microsoft\VisualStudio\7.1\Setup\VS")
     dir = _winreg.QueryValueEx(k, "MSMDir")[0]
     _winreg.CloseKey(k)
-    files = glob.glob1(dir, "*VCR71*.dll")
+    files = glob.glob1(dir, "*CRT71*")
     assert len(files) > 0, (dir, files)
     # Extract msvcr71.dll
-    #m = msilib.MakeMerge2()
-    #m.OpenModule(file, 0)
-    #m.ExtractFiles(".")
-    #m.CloseModule()
-    for file in files:
-        shutil.copy(os.path.join(dir, file), '.')
+    m = msilib.MakeMerge2()
+    m.OpenModule(file, 0)
+    m.ExtractFiles(".")
+    m.CloseModule()
     # Find the version/language of msvcr71.dll
     installer = msilib.MakeInstaller()
     return installer.FileVersion("msvcr71.dll", 0), \