Merged revisions 66722 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66722 | martin.v.loewis | 2008-10-02 13:44:17 +0200 (Do, 02 Okt 2008) | 1 line

  Use CRT 9 policy files.
........

diff --git a/Tools/msi/merge.py b/Tools/msi/merge.py
index 3202f98b2abd944f1478fc1f85728e256c83684e..959978be44b18d646528201d91672018c235a002 100644 (file)
--- a/Tools/msi/merge.py
+++ b/Tools/msi/merge.py
@@ -9,10 +9,10 @@ msi = None
 if len(sys.argv)==2:\r
     msi = sys.argv[1]\r
 if Win64:\r
-    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]\r
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_9_0_Microsoft_VC90_CRT_x86_x64.msm"]\r
     if not msi: msi = "python-%s.amd64.msi" % full_current_version\r
 else:\r
-    modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]\r
+    modules = ["Microsoft_VC90_CRT_x86.msm","policy_9_0_Microsoft_VC90_CRT_x86.msm"]\r
     if not msi: msi = "python-%s.msi" % full_current_version\r
 for i, n in enumerate(modules):\r
     modules[i] = os.path.join(mod_dir, n)\r