[Python-checkins] r79248 - in python/branches/release26-maint: Misc/NEWS Tools/msi/msi.py

[martin.v.loewis]

Author: martin.v.loewis
Date: Sun Mar 21 22:52:46 2010
New Revision: 79248

Log:
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.
........


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/Tools/msi/msi.py

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Sun Mar 21 22:52:46 2010
@@ -43,6 +43,8 @@
 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.

Modified: python/branches/release26-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release26-maint/Tools/msi/msi.py	(original)
+++ python/branches/release26-maint/Tools/msi/msi.py	Sun Mar 21 22:52:46 2010
@@ -398,7 +398,7 @@
               ("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", [