From: Brian Curtin <brian.curtin@gmail.com>
Date: Mon, 22 Nov 2010 02:04:33 +0000 (+0000)
Subject: Backport the distutils part of r83399 to fix #7645.
X-Git-Tag: v3.1.3~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f213d2317cc167263bb8599e599bddc5537fed1a;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 8f958147441d..53b18d60e12b 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -32,6 +32,8 @@ Library
 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).
diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index ae3b01892cc2..1a87a4081645 100644
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -1019,6 +1019,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=='output':