From: Martin v. Löwis <martin@v.loewis.de>
Date: Sun, 21 Mar 2010 21:52:46 +0000 (+0000)
Subject: Merged revisions 78976 via svnmerge from
X-Git-Tag: v2.6.6rc1~558
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=974dd583720cee19f3f722002720a0f2cd704577;p=python

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 10dd9e26fd..e4500a8979 100644
--- 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 e1f43714ee..bf9ef87453 100644
--- 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", [