Merged revisions 78976 via svnmerge from

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

........
  r78976 | martin.v.loewis | 2010-03-15 14:00:17 +0100 (Mo, 15 Mär 2010) | 1 line

  Issue #6716: Quote -x arguments of compileall in MSI installer.
........

diff --git a/Misc/NEWS b/Misc/NEWS
index 10dd9e26fd0a2d444fd54113d821897d58cbd6ee..e4500a8979616327309bb27c1f8e1da3815807c8 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -43,6 +43,8 @@ Library
 Build
 -----
 
+- Issue #6716: Quote -x arguments of compileall in MSI installer.
+
 - Issue #1628484: The Makefile doesn't ignore the CFLAGS environment
   variable anymore.  It also forwards the LDFLAGS settings to the linker
   when building a shared library.

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index e1f43714eefc778ebc6d4415dfd76520d9b3418e..bf9ef87453e9001091f937ca635f76f6cfdef69a 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -398,7 +398,7 @@ def add_ui(db):
               ("VerdanaRed9", "Verdana", 9, 255, 0),
              ])
 
-    compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages|py3_ "[TARGETDIR]Lib"'
+    compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py3_" "[TARGETDIR]Lib"'
     lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"'
     # See "CustomAction Table"
     add_data(db, "CustomAction", [