From 09c86afb1e3b2f1af8a03f77f2dd146429f56add Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Tue, 16 Mar 2010 11:03:13 +0000 Subject: Merged revisions 78976 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ........ 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. ........ --- Misc/NEWS | 2 ++ Tools/msi/msi.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 84b2bb9..93a991b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -835,6 +835,8 @@ Extension Modules Build ----- +- Issue #6716: Quote -x arguments of compileall in MSI installer. + - Issue #3920, #7903: Define _BSD_SOURCE on OpenBSD 4.4 through 4.9. - Issue #7632: When Py_USING_MEMORY_DEBUGGER is defined, disable the diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py index f32bf39..37bcbb6 100644 --- a/Tools/msi/msi.py +++ b/Tools/msi/msi.py @@ -403,7 +403,7 @@ def add_ui(db): ("VerdanaRed9", "Verdana", 9, 255, 0), ]) - compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages|py2_ "[TARGETDIR]Lib"' + compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x "bad_coding|badsyntax|site-packages|py2_" "[TARGETDIR]Lib"' lib2to3args = r'-c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()"' # See "CustomAction Table" add_data(db, "CustomAction", [ -- cgit v0.12