[Python-checkins] cpython (merge 3.3 -> default): Merge with 3.3

martin.v.loewis python-checkins at python.org
Sat Sep 29 13:10:40 CEST 2012


http://hg.python.org/cpython/rev/ed358a8e5212
changeset:   79246:ed358a8e5212
parent:      79244:1465cbbc8f64
parent:      79245:d5d2af9f11bf
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sat Sep 29 13:10:09 2012 +0200
summary:
  Merge with 3.3

files:
  Tools/msi/msi.py |  2 ++
  1 files changed, 2 insertions(+), 0 deletions(-)


diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -977,6 +977,8 @@
     launchersrc = PCBUILD
     if launchersrc.lower() == 'pcbuild\\x64-pgo':
         launchersrc = 'PCBuild\\win32-pgo'
+    if launchersrc.lower() == 'pcbuild\\amd64':
+        launchersrc = 'PCBuild'
     launcher = os.path.join(srcdir, launchersrc, "py.exe")
     launcherdir.start_component("launcher", flags = 8+256, keyfile="py.exe")
     launcherdir.add_file(launcher,

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list