From: Brian Curtin <brian.curtin@gmail.com>
Date: Mon, 22 Nov 2010 02:08:49 +0000 (+0000)
Subject: Backport the distutils part of r83399 to fix #7645.
X-Git-Tag: v2.7.1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69a106ab41424dfcffb5cb7169459ea66b65ad3a;p=python

Backport the distutils part of r83399 to fix #7645.
---

diff --git a/Misc/NEWS b/Misc/NEWS
index fc40da565f..315b55694b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -29,6 +29,8 @@ Library
 Build
 -----
 
+- Backport r83399 to allow test_distutils to pass on installed versions.
+
 - Issue #1303434: Generate ZIP file containing all PDBs.
 
 Tests
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index d9882831fc..a1f67b84db 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1020,6 +1020,8 @@ def add_files(db):
             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':