[Python-3000-checkins] r66515 - in python/branches/py3k: Tools/msi/merge.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Sep 19 17:24:28 2008
New Revision: 66515

Log:
Merged revisions 66514 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66514 | martin.v.loewis | 2008-09-19 17:21:07 +0200 (Fr, 19 Sep 2008) | 2 lines
  
  Bug #3887: Package x64 version of CRT for AMD64 
  Windows binaries.
........


Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Tools/msi/merge.py

Modified: python/branches/py3k/Tools/msi/merge.py
==============================================================================
--- python/branches/py3k/Tools/msi/merge.py	(original)
+++ python/branches/py3k/Tools/msi/merge.py	Fri Sep 19 17:24:28 2008
@@ -9,7 +9,7 @@
 if len(sys.argv)==2:
     msi = sys.argv[1]
 if Win64:
-    modules = ["Microsoft_VC90_CRT_x86.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
+    modules = ["Microsoft_VC90_CRT_x86_x64.msm", "policy_8_0_Microsoft_VC80_CRT_x86_x64.msm"]
     if not msi: msi = "python-%s.amd64.msi" % full_current_version
 else:
     modules = ["Microsoft_VC90_CRT_x86.msm","policy_8_0_Microsoft_VC80_CRT_x86.msm"]