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

[brian.curtin]

Author: brian.curtin
Date: Mon Nov 22 03:04:33 2010
New Revision: 86666

Log:
Backport the distutils part of r83399 to fix #7645.


Modified:
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/Tools/msi/msi.py

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Mon Nov 22 03:04:33 2010
@@ -32,6 +32,8 @@
 Build
 -----
 
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
 - Issue #1303434: Generate ZIP file containing all PDBs (already done for rc1).
 
 - Stop packaging versioncheck tool (already done for rc1).

Modified: python/branches/release31-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release31-maint/Tools/msi/msi.py	(original)
+++ python/branches/release31-maint/Tools/msi/msi.py	Mon Nov 22 03:04:33 2010
@@ -1019,6 +1019,8 @@
             lib.glob("*.pem")
             lib.glob("*.pck")
             lib.add_file("zipdir.zip")
+        if dir=='tests' and parent.physical=='distutils':
+            lib.add_file("Setup.sample")
         if dir=='decimaltestdata':
             lib.glob("*.decTest")
         if dir=='output':