[Python-checkins] r47259 - in python/trunk: Misc/NEWS Tools/msi/msi.py

martin.v.loewis python-checkins at python.org
Thu Jul 6 09:05:22 CEST 2006


Author: martin.v.loewis
Date: Thu Jul  6 09:05:21 2006
New Revision: 47259

Modified:
   python/trunk/Misc/NEWS
   python/trunk/Tools/msi/msi.py
Log:
Properly quote compileall and Lib paths in case TARGETDIR has a space.

Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS	(original)
+++ python/trunk/Misc/NEWS	Thu Jul  6 09:05:21 2006
@@ -89,6 +89,9 @@
 Build
 -----
 
+- The MSI compileall step was fixed to also support a TARGETDIR
+  with spaces in it.
+
 - Bug #1517388: sqlite3.dll is now installed on Windows independent
   of Tcl/Tk.
 

Modified: python/trunk/Tools/msi/msi.py
==============================================================================
--- python/trunk/Tools/msi/msi.py	(original)
+++ python/trunk/Tools/msi/msi.py	Thu Jul  6 09:05:21 2006
@@ -367,7 +367,7 @@
               ("VerdanaRed9", "Verdana", 9, 255, 0),
              ])
 
-    compileargs = r"-Wi [TARGETDIR]Lib\compileall.py -f -x bad_coding|badsyntax|site-packages [TARGETDIR]Lib"
+    compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages "[TARGETDIR]Lib"'
     # See "CustomAction Table"
     add_data(db, "CustomAction", [
         # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty


More information about the Python-checkins mailing list