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

[brian.curtin]

Author: brian.curtin
Date: Mon Nov 22 03:08:49 2010
New Revision: 86667

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


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

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Mon Nov 22 03:08:49 2010
@@ -29,6 +29,8 @@
 Build
 -----
 
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
 - Issue #1303434: Generate ZIP file containing all PDBs.
 
 Tests

Modified: python/branches/release27-maint/Tools/msi/msi.py
==============================================================================
--- python/branches/release27-maint/Tools/msi/msi.py	(original)
+++ python/branches/release27-maint/Tools/msi/msi.py	Mon Nov 22 03:08:49 2010
@@ -1020,6 +1020,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=='xmltestdata':